From 3181b2fb3542bd41aad66ecaa8a5ba0910dfc8f4 Mon Sep 17 00:00:00 2001 From: kai Date: Wed, 26 Aug 2026 13:31:37 +0200 Subject: [PATCH] Move Docker configuration secrets to environment file --- .env.example | 7 +++++++ .gitignore | 2 ++ compose.yml | 23 ++++++++++++++++------- 3 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..0f626a6 --- /dev/null +++ b/.env.example @@ -0,0 +1,7 @@ +POSTGRES_DB=concerts +POSTGRES_USER=concerts +POSTGRES_PASSWORD=CHANGE_ME + +INITIAL_ADMIN_USERNAME=Kai +INITIAL_ADMIN_PASSWORD=03vogjhq-Metal +INITIAL_ADMIN_EMAIL=metal@pinguholic.de diff --git a/.gitignore b/.gitignore index 65229c0..73ce422 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ db/data/ # IDE .vscode/ .idea/ +pingu-concerts-prod-snapshot.dump +pingu-concerts-uploads.tar.gz diff --git a/compose.yml b/compose.yml index 250fd1f..3332d8e 100644 --- a/compose.yml +++ b/compose.yml @@ -3,30 +3,39 @@ services: image: postgres:17 container_name: pingu-concerts-db restart: unless-stopped + environment: - POSTGRES_DB: concerts - POSTGRES_USER: concerts - POSTGRES_PASSWORD: change-me-later + POSTGRES_DB: ${POSTGRES_DB} + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + volumes: - postgres_data:/var/lib/postgresql/data - ./db/init:/docker-entrypoint-initdb.d:ro + web: build: ./app container_name: pingu-concerts-web restart: unless-stopped + ports: - "8080:8000" + environment: - DATABASE_URL: postgresql://concerts:change-me-later@db:5432/concerts - INITIAL_ADMIN_USERNAME: kai - INITIAL_ADMIN_PASSWORD: test123 - INITIAL_ADMIN_EMAIL: kai@local.invalid + DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB} + + INITIAL_ADMIN_USERNAME: ${INITIAL_ADMIN_USERNAME} + INITIAL_ADMIN_PASSWORD: ${INITIAL_ADMIN_PASSWORD} + INITIAL_ADMIN_EMAIL: ${INITIAL_ADMIN_EMAIL} + volumes: - concert_uploads:/app/static/uploads + depends_on: - db + volumes: postgres_data: concert_uploads: