Remove DATABASE_URL

Author: mfosterw

.devcontainer/devcontainer.json

@@ -28,9 +28,6 @@
   "features": {
     "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
   },
-  "remoteEnv": {
-    "DATABASE_URL": "postgres://${containerEnv:POSTGRES_USER}:${containerEnv:POSTGRES_PASSWORD}@${containerEnv:POSTGRES_HOST}:${containerEnv:POSTGRES_PORT}/${containerEnv:POSTGRES_DB}"
-  },
   // Set *default* container specific settings.json values on container create.
   "customizations": {
     "vscode": {

CONTRIBUTING.rst

@@ -156,7 +156,8 @@ Running Tests Locally
 The easiest way to run tests is by running ``just test``. This will run the tests from
 the ``django`` Docker service so they have access to Postgres. To run the tests in the
 local environment, for example using the VSCode test runner, you must have PostgreSQL_
-installed on your computer. Django should automatically create a test database for you
-when you run the tests.
+installed on your computer, and you must set the environment variable
+``DATABASE_URL=postgres:///democrasite``. Django should automatically create a test
+database for you when you run the tests.
 
 .. _PostgreSQL: https://www.postgresql.org/download/

compose/production/django/Dockerfile

@@ -88,9 +88,7 @@ RUN chown -R django:django ${APP_HOME}
 
 USER django
 
-RUN DATABASE_URL="" \
-  REDIS_URL="" \
-  DJANGO_SETTINGS_MODULE="config.settings.test" \
+RUN DJANGO_SETTINGS_MODULE="config.settings.test" \
   python manage.py compilemessages
 
 ENTRYPOINT ["/entrypoint"]

compose/production/django/entrypoint

@@ -10,7 +10,6 @@ if [ -z "${POSTGRES_USER}" ]; then
     base_postgres_image_default_user='postgres'
     export POSTGRES_USER="${base_postgres_image_default_user}"
 fi
-export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
 
 python << END
 import sys

config/settings/base.py

@@ -37,7 +37,19 @@
 # DATABASES
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#databases
-DATABASES = {"default": env.db("DATABASE_URL", default="postgres:///democrasite")}
+if db_url := env.db("DATABASE_URL", default=None):
+    DATABASES = {"default": db_url}
+else:
+    DATABASES = {
+        "default": {
+            "ENGINE": "django.db.backends.postgresql",
+            "NAME": env.str("POSTGRES_DB"),
+            "USER": env.str("POSTGRES_USER"),
+            "PASSWORD": env.str("POSTGRES_PASSWORD"),
+            "HOST": env.str("POSTGRES_HOST", default="postgres"),
+            "PORT": env.str("POSTGRES_PORT", default="5432"),
+        },
+    }
 DATABASES["default"]["ATOMIC_REQUESTS"] = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-DEFAULT_AUTO_FIELD
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"