Merge pull request #97 from stuartmaxwell/docker-fixes

docker-compose-stage.yml

@@ -0,0 +1,33 @@
+services:
+  app:
+    image: ghcr.io/stuartmaxwell/stuartm.nz:latest
+    entrypoint: /app/entrypoint.sh
+    command: gunicorn --worker-tmp-dir /dev/shm --workers=2 --worker-class=gthread --bind 0.0.0.0:8000 config.wsgi
+    user: "1000"
+    environment:
+      - "SECRET_KEY=${SECRET_KEY}"
+      - "DEBUG=${DEBUG}"
+      - "ALLOWED_HOSTS=${ALLOWED_HOSTS}"
+      - "EMAIL_HOST=${EMAIL_HOST}"
+      - "EMAIL_PORT=${EMAIL_PORT}"
+      - "EMAIL_HOST_USER=${EMAIL_HOST_USER}"
+      - "EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD}"
+      - "EMAIL_USE_TLS=${EMAIL_USE_TLS}"
+      - "DEFAULT_FROM_EMAIL=${DEFAULT_FROM_EMAIL}"
+      - "DB_ENGINE=${DB_ENGINE}"
+      - "DB_HOST=${DB_HOST}"
+      - "DB_NAME=${DB_NAME}"
+      - "DB_PASSWORD=${DB_PASSWORD}"
+      - "DB_PORT=${DB_PORT}"
+      - "DB_USER=${DB_USER}"
+      - "WHITENOISE_STATIC=${WHITENOISE_STATIC}"
+      - "ADMIN_URL=${ADMIN_URL}"
+      - "SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT}"
+      - "SENTRY_DSN=${SENTRY_DSN}"
+      - "SENTRY_TRACES_SAMPLE_RATE=${SENTRY_TRACES_SAMPLE_RATE}"
+      - "BLOG_TITLE=${BLOG_TITLE}"
+      - "POST_PREFIX=${POST_PREFIX}"
+      - "POST_PERMALINK=${POST_PERMALINK}"
+      - "ARCHIVES_PATH_ENABLED=${ARCHIVES_PATH_ENABLED}"
+      - "ARCHIVES_PATH=${ARCHIVES_PATH}"
+      - "DATE_ARCHIVES_ENABLED=${DATE_ARCHIVES_ENABLED}"

env.template

@@ -9,10 +9,19 @@ EMAIL_HOST_PASSWORD=
 EMAIL_USE_TLS=
 DEFAULT_FROM_EMAIL=
 DB_ENGINE=
+DB_HOST=
 DB_NAME=
-DB_USER=
 DB_PASSWORD=
-DB_HOST=
 DB_PORT=
-WHITENOISE_STATIC
+DB_USER=
+WHITENOISE_STATIC=
 ADMIN_URL=
+SENTRY_ENVIRONMENT=
+SENTRY_DSN=
+SENTRY_TRACES_SAMPLE_RATE=
+BLOG_TITLE=
+POST_PREFIX=
+POST_PERMALINK=
+ARCHIVES_PATH_ENABLED=
+ARCHIVES_PATH=
+DATE_ARCHIVES_ENABLED=

justfile

@@ -83,3 +83,7 @@ dc-logs-dev:
 # Run a terminal on the development environment
 dc-exec-dev:
     docker compose --file docker-compose-dev.yml exec app /bin/bash
+
+# Generate a secret key for Django
+secret:
+  {{uv}} manage.py shell -c "from django.core.management.utils import get_random_secret_key; print(get_random_secret_key())"