forked from data.coop/membersystem
Revert healtcheck on Postgres, do it in the entrypoint
This commit is contained in:
parent
250f203900
commit
fa6a5cdb86
|
@ -1,3 +1,4 @@
|
|||
---
|
||||
services:
|
||||
app:
|
||||
build:
|
||||
|
@ -11,8 +12,7 @@ services:
|
|||
volumes:
|
||||
- ./:/app/
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
- postgres
|
||||
env_file:
|
||||
- .env
|
||||
|
||||
|
@ -24,13 +24,6 @@ services:
|
|||
- 5432:5432
|
||||
env_file:
|
||||
- .env
|
||||
# This healthcheck has a large number of retries, this is currently based on the number of
|
||||
# retries necessary to get the database running in GitHub Actions.
|
||||
healthcheck:
|
||||
test: [ "CMD-SHELL", "pg_isready -U postgres -d postgres" ]
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 30
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
|
|
|
@ -1,5 +1,16 @@
|
|||
#!/bin/sh
|
||||
|
||||
echo "Waiting for postgres..."
|
||||
|
||||
POSTGRES_PORT=${POSTGRES_PORT:-5432}
|
||||
POSTGRES_HOST=${POSTGRES_HOST:-localhost}
|
||||
|
||||
while ! nc -z "$POSTGRES_HOST" "$POSTGRES_PORT"; do
|
||||
sleep 0.1
|
||||
done
|
||||
|
||||
echo "PostgreSQL started"
|
||||
|
||||
# Only migrate, collectstatic and compilemessages if we are NOT in development
|
||||
if [ -z "$DEBUG" ]; then
|
||||
python src/manage.py migrate;
|
||||
|
|
Loading…
Reference in a new issue