From 89a2fb84e6ec42ecc04e195252e405c52ecd3a96 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 2 Dec 2019 18:07:23 -0800 Subject: [PATCH] Update temporary server to prefer PGPORT if set (since the client and server both normally respect that variable) --- 10/alpine/docker-entrypoint.sh | 2 +- 10/docker-entrypoint.sh | 2 +- 11/alpine/docker-entrypoint.sh | 2 +- 11/docker-entrypoint.sh | 2 +- 12/alpine/docker-entrypoint.sh | 2 +- 12/docker-entrypoint.sh | 2 +- 9.4/alpine/docker-entrypoint.sh | 2 +- 9.4/docker-entrypoint.sh | 2 +- 9.5/alpine/docker-entrypoint.sh | 2 +- 9.5/docker-entrypoint.sh | 2 +- 9.6/alpine/docker-entrypoint.sh | 2 +- 9.6/docker-entrypoint.sh | 2 +- docker-entrypoint.sh | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/10/alpine/docker-entrypoint.sh b/10/alpine/docker-entrypoint.sh index a724179944..e091025aa7 100755 --- a/10/alpine/docker-entrypoint.sh +++ b/10/alpine/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/10/docker-entrypoint.sh b/10/docker-entrypoint.sh index 81564611fc..1ad6f21e3c 100755 --- a/10/docker-entrypoint.sh +++ b/10/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/11/alpine/docker-entrypoint.sh b/11/alpine/docker-entrypoint.sh index a724179944..e091025aa7 100755 --- a/11/alpine/docker-entrypoint.sh +++ b/11/alpine/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/11/docker-entrypoint.sh b/11/docker-entrypoint.sh index 81564611fc..1ad6f21e3c 100755 --- a/11/docker-entrypoint.sh +++ b/11/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/12/alpine/docker-entrypoint.sh b/12/alpine/docker-entrypoint.sh index a724179944..e091025aa7 100755 --- a/12/alpine/docker-entrypoint.sh +++ b/12/alpine/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/12/docker-entrypoint.sh b/12/docker-entrypoint.sh index 81564611fc..1ad6f21e3c 100755 --- a/12/docker-entrypoint.sh +++ b/12/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.4/alpine/docker-entrypoint.sh b/9.4/alpine/docker-entrypoint.sh index aaf6c4e83a..4d5d4c0527 100755 --- a/9.4/alpine/docker-entrypoint.sh +++ b/9.4/alpine/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh index 78bfef4030..eaa04035b0 100755 --- a/9.4/docker-entrypoint.sh +++ b/9.4/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.5/alpine/docker-entrypoint.sh b/9.5/alpine/docker-entrypoint.sh index aaf6c4e83a..4d5d4c0527 100755 --- a/9.5/alpine/docker-entrypoint.sh +++ b/9.5/alpine/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh index 78bfef4030..eaa04035b0 100755 --- a/9.5/docker-entrypoint.sh +++ b/9.5/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.6/alpine/docker-entrypoint.sh b/9.6/alpine/docker-entrypoint.sh index aaf6c4e83a..4d5d4c0527 100755 --- a/9.6/alpine/docker-entrypoint.sh +++ b/9.6/alpine/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh index 78bfef4030..eaa04035b0 100755 --- a/9.6/docker-entrypoint.sh +++ b/9.6/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 81564611fc..1ad6f21e3c 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -215,7 +215,7 @@ docker_temp_server_start() { # internal start of server in order to allow setup using psql client # does not listen on external TCP/IP and waits until start finishes - set -- "$@" -c listen_addresses='' -p 5432 + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5432}" PGUSER="${PGUSER:-$POSTGRES_USER}" \ pg_ctl -D "$PGDATA" \