diff --git a/docker-compose.yml b/docker-compose.yml index f2453ec..d660de0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,11 +44,6 @@ services: volumes: - postgis-data:/var/lib/postgresql/data restart: always - healthcheck: - test: pg_isready - interval: 1s - timeout: 5s - retries: 30 mkdocs: <<: *django # this will inherit all the settings from the django service diff --git a/envs/example.env b/envs/example.env index 74559ac..3b734dc 100644 --- a/envs/example.env +++ b/envs/example.env @@ -20,11 +20,13 @@ DJANGO_STARTUP_COMMAND="python manage.py runserver 0.0.0.0:8003" # for local dev RCPCH_NHS_ORGANISATIONS_SECRET_KEY="mysecretkey" # DJANGO POSTGRES DATABASE CONNECTION -PGDATABASENAME="nhsorganisationsdb" -PGUSER="nhsorganisationsuser" -PGPASSWORD="password" -PGHOST="postgis" -PGPORT="5432" +POSTGRES_DB="nhsorganisationsdb" +POSTGRES_USER="nhsorganisationsuser" +POSTGRES_PASSWORD="password" +POSTGRES_HOST="postgis" +POSTGRES_PORT="5432" + + # EMAIL EMAIL_DEFAULT_FROM_EMAIL="########" diff --git a/rcpch_nhs_organisations/settings.py b/rcpch_nhs_organisations/settings.py index 8e7b3c4..b4c563a 100644 --- a/rcpch_nhs_organisations/settings.py +++ b/rcpch_nhs_organisations/settings.py @@ -103,11 +103,11 @@ DATABASES = { "default": { "ENGINE": "django.contrib.gis.db.backends.postgis", - "NAME": os.environ.get("PGDATABASENAME"), - "USER": os.environ.get("PGUSER"), - "PASSWORD": os.environ.get("PGPASSWORD"), - "PORT": os.environ.get("PGPORT"), - "HOST": os.environ.get("PGHOST"), + "NAME": os.environ.get("POSTGRES_DB"), + "USER": os.environ.get("POSTGRES_USER"), + "PASSWORD": os.environ.get("POSTGRES_PASSWORD"), + "PORT": os.environ.get("POSTGRES_PORT"), + "HOST": os.environ.get("POSTGRES_HOST"), } } diff --git a/s/pr-check b/s/pr-check index 6091abe..930b512 100755 --- a/s/pr-check +++ b/s/pr-check @@ -1,5 +1,6 @@ #!/bin/bash -e -# s/up --detach --wait -s/up +s/up --detach +# I tried --wait and a healthcheck but still got connection refused from postgres +sleep 5 s/test \ No newline at end of file