feat: improve staging configuration, add production group to uv, update README.md

Author: Mangolja

django/{{ cookiecutter.project_slug }}/.gitlab/Dockerfile

@@ -10,10 +10,8 @@ ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN uv sync
-
 COPY . .
 
 FROM base as app
 
-RUN uv run manage.py collectstatic --no-input
+RUN uv run --no-dev --group production manage.py collectstatic --no-input

django/{{ cookiecutter.project_slug }}/.gitlab/docker-compose.staging.yml

@@ -11,11 +11,11 @@ services:
       - POSTGRES_DB
       - POSTGRES_USER
       - POSTGRES_PASSWORD
-      - POSTGRES_HOST # TODO: Set this to the service name of your PostgreSQL container
+      - POSTGRES_HOST={{ cookiecutter.project_slug }}-postgres
     depends_on:
       postgres:
         condition: service_healthy
-    command: [ "uv", "run", "manage.py", "migrate" ]
+    command: [ "uv", "run","--no-dev", "--group", "production", "manage.py", "migrate" ]
 
   app:
     extends:
@@ -25,10 +25,14 @@ services:
       dockerfile: .gitlab/Dockerfile
       target: app
     restart: unless-stopped
-    command: ["uv", "run", "gunicorn", "-b", ":8000", "--workers=3", "--enable-stdio-inheritance", "{{ cookiecutter.project_slug }}.wsgi:application"]
+    command: ["uv", "run","--no-dev", "--group", "production", "gunicorn", "-b", ":8000", "--workers=3", "--enable-stdio-inheritance", "{{ cookiecutter.project_slug }}.wsgi:application"]
     expose:
       - 8000
   postgres:
+    networks:
+      default:
+        aliases:
+          - {{ cookiecutter.project_slug }}-postgres
     image: postgres:{{ cookiecutter.postgresql_version }}
     restart: unless-stopped
     volumes:

django/{{ cookiecutter.project_slug }}/README.md

@@ -1,4 +1,5 @@
-# {{ cookiecutter.project_name }}
+# {{ cookiecutter.project_name }} ({{ cookiecutter.customer }})
+
 
 ## Tech stack
 
@@ -7,40 +8,45 @@
 - PostgreSQL {{ cookiecutter.postgresql_version }}
 - Django
 
+
+**------------------- BEGIN DELETE SECTION --------------------**
+
 ## Get started after cookiecutter
 
-1. Adjust the code as you need
-2. Resolve the remaining TODOs in the code
-3. Create a remote git repository
-4. Initialize git in the project
+1. Create a new remote git repository [here](https://singular-code.de/projects/new)
+   1. Create the following CI/CD variables (under Settings > CI/CD > Variables > Project variables):
+       - `DJANGO_SECRET_KEY`
+         - Visibility: `Masked`
+         - Protect variable: `yes`
+         - Expand variable reference: `no`
+         - Key: `DJANGO_SECRET_KEY`
+         - Value:
+         ```shell
+         python -c "import secrets; print(secrets.token_urlsafe(50))"
+         ```
+2. Initialize git in the project
 
    ```bash
-   git init -b main
+   git init --initial-branch=main
    ```
-5. Enable pre-commit hooks:
+3. Enable pre-commit hooks:
 
    ```bash
    pre-commit install
    ```
 
-6. Add and commit the initial code:
+4. Delete this section
+
+5. Create an initial commit and push to the remote repository:
 
    ```bash
    git add .
    git commit -m "Initial commit"
    git remote add origin <your-repo-url>
-   git push origin main
+   git push --set-upstream origin main
    ```
 
-5. Go to the remote git repository and create a CI/CD variable (under Settings > CI/CD > Variables > Project variables):
-
-    - `DJANGO_SECRET_KEY`
-      - Visibility: `Masked`
-      - Protect variable: `yes`
-      - Expand variable reference: `no`
-      - Key: `DJANGO_SECRET_KEY`
-      - Value: generate it using `python -c "import secrets; print(secrets.token_urlsafe(50))"`
-6. Delete this section and make a second commit
+**------------------- END DELETE SECTION --------------------**
 
 ## Get started locally
 

django/{{ cookiecutter.project_slug }}/pyproject.toml

@@ -9,7 +9,6 @@ dependencies = [
     "django-admin-interface>=0.30.0",
     "django-debug-toolbar>=5.2.0",
     "django-environ>=0.12.0",
-    "gunicorn>=23.0.0",
     "psycopg[binary]>=3.2.9",
     "whitenoise>=6.9.0",
 ]
@@ -18,3 +17,6 @@ dependencies = [
 dev = [
     "pre-commit>=4.2.0",
 ]
+production = [
+    "gunicorn>=23.0.0",
+]

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

@@ -38,7 +38,7 @@
 
 # Security
 
-SECRET_KEY = env.str("DJANGO_SECRET_KEY", "{{ random_ascii_string(48) }}")
+SECRET_KEY = env.str("DJANGO_SECRET_KEY", "{{ random_ascii_string(50) }}")
 X_FRAME_OPTIONS = "SAMEORIGIN"
 SILENCED_SYSTEM_CHECKS = ["security.W019"]