Merge 958c39011e into 285e86bf71

docs/2-local-development/developing-locally.rst

@@ -54,7 +54,9 @@ First things first.
 
 #. Set the environment variables for your database(s): ::
 
-    $ export DATABASE_URL=postgres://postgres:<password>@127.0.0.1:5432/<DB name given to createdb>
+    $ export POSTGRES_USER=postgres
+    $ export POSTGRES_PASSWORD=
+    $ export POSTGRES_DB=<DB name given to createdb>
 
    .. note::
 

{{cookiecutter.project_slug}}/.drone.yml

@@ -28,8 +28,6 @@ steps:
   pull: if-not-exists
   {%- if cookiecutter.use_docker == 'y' %}
   image: docker:25.0
-  environment:
-    DATABASE_URL: pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB
   commands:
   - docker-compose -f docker-compose.local.yml build
   - docker-compose -f docker-compose.docs.yml build

{{cookiecutter.project_slug}}/.github/workflows/ci.yml

@@ -59,8 +59,11 @@ jobs:
       {%- if cookiecutter.use_celery == 'y' %}
       REDIS_URL: 'redis://localhost:6379/0'
       {%- endif %}
-      # postgres://user:password@host:port/database
+      POSTGRES_USER: 'postgres'
-      DATABASE_URL: 'postgres://postgres:postgres@localhost:5432/postgres'
+      POSTGRES_PASSWORD: 'postgres'
+      POSTGRES_DB: 'postgres'
+      POSTGRES_HOST: 'postgres'
+
     {%- endif %}
 
     steps:

{{cookiecutter.project_slug}}/.gitlab-ci.yml

@@ -5,6 +5,7 @@ stages:
 variables:
   POSTGRES_USER: '{{ cookiecutter.project_slug }}'
   POSTGRES_PASSWORD: ''
+  POSTGRES_HOST: postgres
   POSTGRES_DB: 'test_{{ cookiecutter.project_slug }}'
   POSTGRES_HOST_AUTH_METHOD: trust
   {%- if cookiecutter.use_celery == 'y' %}
@@ -42,8 +43,6 @@ pytest:
   image: python:3.12
   services:
     - postgres:{{ cookiecutter.postgresql_version }}
-  variables:
-    DATABASE_URL: pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB
   before_script:
     - pip install -r requirements/local.txt
   script:

{{cookiecutter.project_slug}}/compose/production/django/Dockerfile

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

{{cookiecutter.project_slug}}/compose/production/django/entrypoint

@@ -8,7 +8,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}"
 
 wait-for-it "${POSTGRES_HOST}:${POSTGRES_PORT}" -t 30
 

{{cookiecutter.project_slug}}/config/settings/base.py

@@ -48,16 +48,21 @@ LOCALE_PATHS = [str(BASE_DIR / "locale")]
 # DATABASES
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#databases
-{% if cookiecutter.use_docker == "y" -%}
+
-DATABASES = {"default": env.db("DATABASE_URL")}
+if db_url := env.db("DATABASE_URL", default=None):
-{%- else %}
+    DATABASES = {"default": db_url}
-DATABASES = {
+else:
-    "default": env.db(
+    DATABASES = {
-        "DATABASE_URL",
+        "default": {
-        default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}",
+            "ENGINE": "django.db.backends.postgresql",
-    ),
+            "NAME": env.str("POSTGRES_DB"),
-}
+            "USER": env.str("POSTGRES_USER"),
-{%- endif %}
+            "PASSWORD": env.str("POSTGRES_PASSWORD"),
+            "HOST": env.str("POSTGRES_HOST", default="{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}localhost{%else%}postgres{% endif %}"),
+            "PORT": env.str("POSTGRES_PORT", default="5432"),
+        },
+    }
+
 DATABASES["default"]["ATOMIC_REQUESTS"] = True
 # https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-DEFAULT_AUTO_FIELD
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"