From 7111ef75d67278b9fc5159d105121392ba953e89 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 21 Aug 2015 15:39:01 -0700 Subject: [PATCH] Run update.sh --- 9.0/docker-entrypoint.sh | 26 ++++++-------------------- 9.1/docker-entrypoint.sh | 26 ++++++-------------------- 9.2/docker-entrypoint.sh | 26 ++++++-------------------- 9.3/docker-entrypoint.sh | 26 ++++++-------------------- 9.4/docker-entrypoint.sh | 26 ++++++-------------------- 9.5/docker-entrypoint.sh | 26 ++++++-------------------- docker-entrypoint.sh | 6 +++--- 7 files changed, 39 insertions(+), 123 deletions(-) diff --git a/9.0/docker-entrypoint.sh b/9.0/docker-entrypoint.sh index 42a383de78..74912e7e50 100755 --- a/9.0/docker-entrypoint.sh +++ b/9.0/docker-entrypoint.sh @@ -44,21 +44,11 @@ if [ "$1" = 'postgres' ]; then { echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf" - set_listen_addresses '' # we're going to start up postgres, but it's not ready for use yet (this is initialization), so don't listen to the outside world yet - - gosu postgres "$@" & - pid="$!" - for i in {30..0}; do - if echo 'SELECT 1' | psql --username postgres &> /dev/null; then - break - fi - echo 'PostgreSQL init process in progress...' - sleep 1 - done - if [ "$i" = 0 ]; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi + # internal start of server in order to allow set-up using psql-client + # does not listen on TCP/IP and waits until start finishes + gosu postgres pg_ctl -D "$PGDATA" \ + -o "-c listen_addresses=''" \ + -w start : ${POSTGRES_USER:=postgres} : ${POSTGRES_DB:=$POSTGRES_USER} @@ -91,11 +81,7 @@ if [ "$1" = 'postgres' ]; then echo done - if ! kill -s TERM "$pid" || ! wait "$pid"; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi - + gosu postgres pg_ctl -D "$PGDATA" -m fast -w stop set_listen_addresses '*' echo diff --git a/9.1/docker-entrypoint.sh b/9.1/docker-entrypoint.sh index 42a383de78..74912e7e50 100755 --- a/9.1/docker-entrypoint.sh +++ b/9.1/docker-entrypoint.sh @@ -44,21 +44,11 @@ if [ "$1" = 'postgres' ]; then { echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf" - set_listen_addresses '' # we're going to start up postgres, but it's not ready for use yet (this is initialization), so don't listen to the outside world yet - - gosu postgres "$@" & - pid="$!" - for i in {30..0}; do - if echo 'SELECT 1' | psql --username postgres &> /dev/null; then - break - fi - echo 'PostgreSQL init process in progress...' - sleep 1 - done - if [ "$i" = 0 ]; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi + # internal start of server in order to allow set-up using psql-client + # does not listen on TCP/IP and waits until start finishes + gosu postgres pg_ctl -D "$PGDATA" \ + -o "-c listen_addresses=''" \ + -w start : ${POSTGRES_USER:=postgres} : ${POSTGRES_DB:=$POSTGRES_USER} @@ -91,11 +81,7 @@ if [ "$1" = 'postgres' ]; then echo done - if ! kill -s TERM "$pid" || ! wait "$pid"; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi - + gosu postgres pg_ctl -D "$PGDATA" -m fast -w stop set_listen_addresses '*' echo diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh index 42a383de78..74912e7e50 100755 --- a/9.2/docker-entrypoint.sh +++ b/9.2/docker-entrypoint.sh @@ -44,21 +44,11 @@ if [ "$1" = 'postgres' ]; then { echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf" - set_listen_addresses '' # we're going to start up postgres, but it's not ready for use yet (this is initialization), so don't listen to the outside world yet - - gosu postgres "$@" & - pid="$!" - for i in {30..0}; do - if echo 'SELECT 1' | psql --username postgres &> /dev/null; then - break - fi - echo 'PostgreSQL init process in progress...' - sleep 1 - done - if [ "$i" = 0 ]; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi + # internal start of server in order to allow set-up using psql-client + # does not listen on TCP/IP and waits until start finishes + gosu postgres pg_ctl -D "$PGDATA" \ + -o "-c listen_addresses=''" \ + -w start : ${POSTGRES_USER:=postgres} : ${POSTGRES_DB:=$POSTGRES_USER} @@ -91,11 +81,7 @@ if [ "$1" = 'postgres' ]; then echo done - if ! kill -s TERM "$pid" || ! wait "$pid"; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi - + gosu postgres pg_ctl -D "$PGDATA" -m fast -w stop set_listen_addresses '*' echo diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh index 42a383de78..74912e7e50 100755 --- a/9.3/docker-entrypoint.sh +++ b/9.3/docker-entrypoint.sh @@ -44,21 +44,11 @@ if [ "$1" = 'postgres' ]; then { echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf" - set_listen_addresses '' # we're going to start up postgres, but it's not ready for use yet (this is initialization), so don't listen to the outside world yet - - gosu postgres "$@" & - pid="$!" - for i in {30..0}; do - if echo 'SELECT 1' | psql --username postgres &> /dev/null; then - break - fi - echo 'PostgreSQL init process in progress...' - sleep 1 - done - if [ "$i" = 0 ]; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi + # internal start of server in order to allow set-up using psql-client + # does not listen on TCP/IP and waits until start finishes + gosu postgres pg_ctl -D "$PGDATA" \ + -o "-c listen_addresses=''" \ + -w start : ${POSTGRES_USER:=postgres} : ${POSTGRES_DB:=$POSTGRES_USER} @@ -91,11 +81,7 @@ if [ "$1" = 'postgres' ]; then echo done - if ! kill -s TERM "$pid" || ! wait "$pid"; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi - + gosu postgres pg_ctl -D "$PGDATA" -m fast -w stop set_listen_addresses '*' echo diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh index 42a383de78..74912e7e50 100755 --- a/9.4/docker-entrypoint.sh +++ b/9.4/docker-entrypoint.sh @@ -44,21 +44,11 @@ if [ "$1" = 'postgres' ]; then { echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf" - set_listen_addresses '' # we're going to start up postgres, but it's not ready for use yet (this is initialization), so don't listen to the outside world yet - - gosu postgres "$@" & - pid="$!" - for i in {30..0}; do - if echo 'SELECT 1' | psql --username postgres &> /dev/null; then - break - fi - echo 'PostgreSQL init process in progress...' - sleep 1 - done - if [ "$i" = 0 ]; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi + # internal start of server in order to allow set-up using psql-client + # does not listen on TCP/IP and waits until start finishes + gosu postgres pg_ctl -D "$PGDATA" \ + -o "-c listen_addresses=''" \ + -w start : ${POSTGRES_USER:=postgres} : ${POSTGRES_DB:=$POSTGRES_USER} @@ -91,11 +81,7 @@ if [ "$1" = 'postgres' ]; then echo done - if ! kill -s TERM "$pid" || ! wait "$pid"; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi - + gosu postgres pg_ctl -D "$PGDATA" -m fast -w stop set_listen_addresses '*' echo diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh index 42a383de78..74912e7e50 100755 --- a/9.5/docker-entrypoint.sh +++ b/9.5/docker-entrypoint.sh @@ -44,21 +44,11 @@ if [ "$1" = 'postgres' ]; then { echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf" - set_listen_addresses '' # we're going to start up postgres, but it's not ready for use yet (this is initialization), so don't listen to the outside world yet - - gosu postgres "$@" & - pid="$!" - for i in {30..0}; do - if echo 'SELECT 1' | psql --username postgres &> /dev/null; then - break - fi - echo 'PostgreSQL init process in progress...' - sleep 1 - done - if [ "$i" = 0 ]; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi + # internal start of server in order to allow set-up using psql-client + # does not listen on TCP/IP and waits until start finishes + gosu postgres pg_ctl -D "$PGDATA" \ + -o "-c listen_addresses=''" \ + -w start : ${POSTGRES_USER:=postgres} : ${POSTGRES_DB:=$POSTGRES_USER} @@ -91,11 +81,7 @@ if [ "$1" = 'postgres' ]; then echo done - if ! kill -s TERM "$pid" || ! wait "$pid"; then - echo >&2 'PostgreSQL init process failed' - exit 1 - fi - + gosu postgres pg_ctl -D "$PGDATA" -m fast -w stop set_listen_addresses '*' echo diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index beb16e2dba..74912e7e50 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -45,10 +45,10 @@ if [ "$1" = 'postgres' ]; then { echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf" # internal start of server in order to allow set-up using psql-client + # does not listen on TCP/IP and waits until start finishes gosu postgres pg_ctl -D "$PGDATA" \ - -o "-c listen_addresses=''" \ - -w start # does not listen on TCP/IP and waits - # until start finishes + -o "-c listen_addresses=''" \ + -w start : ${POSTGRES_USER:=postgres} : ${POSTGRES_DB:=$POSTGRES_USER}