1
0
mirror of https://github.com/docker-library/postgres.git synced 2025-11-17 13:02:40 +03:00

Merge pull request #80 from renzok/fix-server-start

more sane way of starting and stopping postgres server using pg_ctl
This commit is contained in:
Tianon Gravi
2015-08-21 15:38:14 -07:00

View File

@@ -44,21 +44,11 @@ if [ "$1" = 'postgres' ]; then
{ echo; echo "host all all 0.0.0.0/0 $authMethod"; } >> "$PGDATA/pg_hba.conf" { 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 # internal start of server in order to allow set-up using psql-client
gosu postgres pg_ctl -D "$PGDATA" \
gosu postgres "$@" & -o "-c listen_addresses=''" \
pid="$!" -w start # does not listen on TCP/IP and waits
for i in {30..0}; do # until start finishes
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
: ${POSTGRES_USER:=postgres} : ${POSTGRES_USER:=postgres}
: ${POSTGRES_DB:=$POSTGRES_USER} : ${POSTGRES_DB:=$POSTGRES_USER}
@@ -91,11 +81,7 @@ if [ "$1" = 'postgres' ]; then
echo echo
done done
if ! kill -s TERM "$pid" || ! wait "$pid"; then gosu postgres pg_ctl -D "$PGDATA" -m fast -w stop
echo >&2 'PostgreSQL init process failed'
exit 1
fi
set_listen_addresses '*' set_listen_addresses '*'
echo echo