ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

server: Fix database config in Docker entrypoint

Browse Source 
Firstly, this patch ensures that the server connects to the database
according to the given configuration variables.  Up until now, there was
a pg_isready check for the hard-coded hostname "db".  While this
generally worked in the default setup – db is an alias for pgbouncer in
the provided YAML configuration files – it is obviously wrong and would
lead to unexpected behavior in customized setups.

Secondly, the .pgpass setup, which was a remnant of another time and not
used anymore, has been removed.
This commit is contained in:
Gernot Schulz 2021-01-18 13:43:43 +01:00
parent 4f4bff9bb3
commit 0f0d750d83
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/docker/entrypoint-db-setup
View File

@ -24,12 +24,7 @@ source /run/secrets/django
} }
export SECRET_KEY="$DJANGO_SECRET_KEY" export SECRET_KEY="$DJANGO_SECRET_KEY"
# Configure database until pg_isready -h "${DATABASE_HOST}" -p "${DATABASE_PORT:-5432}"; do
# TODO: env variables??
echo "postgres:5432:instancecfg:openslides:openslides" > "${HOME}/.pgpass"
chmod 600 "${HOME}/.pgpass"
until pg_isready -h db; do
echo "Waiting for Postgres cluster to become available..." echo "Waiting for Postgres cluster to become available..."
sleep 3 sleep 3
done done