refactor: enhance environment configuration and CI workflow for improved flexibility
- Updated .env.example to provide clearer instructions and examples for production and development environments. - Refactored docker-compose files to utilize environment variables for database and application settings, improving configurability. - Enhanced .gitea/workflows/test.yml to streamline E2E testing setup, ensuring consistent handling of environment variables across different stages.
This commit is contained in:
1 parent
f4a86f9726
commit
fe86d763ad
5 files changed
+91
-78
No files matched your search
+18
-20
@@ -1,15 +1,15 @@
|
||||
version: '3.8'
|
||||
|
||||
# Keine festen container_name: Namen sind hostweit eindeutig und kollidieren bei
|
||||
# erneuten Deploys / anderem Compose-Projektprefix. Compose vergibt z. B. <projekt>-postgres-1.
|
||||
# Keine festen container_name — Compose-Namen haben Projektprefix (<projekt>-postgres-1).
|
||||
# Gleiche Variablennamen wie docker-compose.yml; andere Werte in einer eigenen .env neben dieser Datei.
|
||||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
environment:
|
||||
POSTGRES_DB: shinkan_dev
|
||||
POSTGRES_USER: shinkan_dev
|
||||
POSTGRES_PASSWORD: dev_password
|
||||
POSTGRES_DB: "${DB_NAME:-shinkan_dev}"
|
||||
POSTGRES_USER: "${DB_USER:-shinkan_dev}"
|
||||
POSTGRES_PASSWORD: "${DB_PASSWORD:-dev_password}"
|
||||
volumes:
|
||||
- dev-shinkan-db-data:/var/lib/postgresql/data
|
||||
ports:
|
||||
@@ -25,9 +25,9 @@ services:
|
||||
environment:
|
||||
DB_HOST: postgres
|
||||
DB_PORT: 5432
|
||||
DB_NAME: shinkan_dev
|
||||
DB_USER: shinkan_dev
|
||||
DB_PASSWORD: dev_password
|
||||
DB_NAME: "${DB_NAME:-shinkan_dev}"
|
||||
DB_USER: "${DB_USER:-shinkan_dev}"
|
||||
DB_PASSWORD: "${DB_PASSWORD:-dev_password}"
|
||||
OPENROUTER_API_KEY: ${OPENROUTER_API_KEY}
|
||||
OPENROUTER_MODEL: ${OPENROUTER_MODEL}
|
||||
SMTP_HOST: ${SMTP_HOST}
|
||||
@@ -35,18 +35,16 @@ services:
|
||||
SMTP_USER: ${SMTP_USER}
|
||||
SMTP_PASS: ${SMTP_PASS}
|
||||
SMTP_FROM: ${SMTP_FROM}
|
||||
# Öffentliche Dev-URL (E-Mail-Links); lokaler Zugriff per IP bleibt über ALLOWED_ORIGINS möglich
|
||||
APP_URL: "${DEV_APP_URL:-https://dev.shinkan.jinkendo.de}"
|
||||
# Login/Register vom Browser: HTTPS-Subdomain und optional LAN-IP (Compose überschreibbar per .env)
|
||||
ALLOWED_ORIGINS: "${DEV_ALLOWED_ORIGINS:-https://dev.shinkan.jinkendo.de,http://192.168.2.49:3098}"
|
||||
ENVIRONMENT: development
|
||||
MEDIAWIKI_API_URL: https://karatetrainer.net/api.php
|
||||
MEDIAWIKI_USER: Jinkendo
|
||||
MEDIAWIKI_PASSWORD: Jinkendo6970
|
||||
MEDIAWIKI_CATEGORY_EXERCISES: Übungen
|
||||
MEDIAWIKI_CATEGORY_SKILLS: Fähigkeitsbeschreibung
|
||||
MEDIAWIKI_CATEGORY_METHODS: Methodenbeschreibung
|
||||
MEDIAWIKI_CATEGORY_MODELS: Reifegradmodelle
|
||||
APP_URL: "${APP_URL:-https://dev.shinkan.jinkendo.de}"
|
||||
ALLOWED_ORIGINS: "${ALLOWED_ORIGINS:-https://dev.shinkan.jinkendo.de,http://192.168.2.49:3098}"
|
||||
ENVIRONMENT: "${ENVIRONMENT:-development}"
|
||||
MEDIAWIKI_API_URL: "${MEDIAWIKI_API_URL:-https://karatetrainer.net/api.php}"
|
||||
MEDIAWIKI_USER: "${MEDIAWIKI_USER:-Jinkendo}"
|
||||
MEDIAWIKI_PASSWORD: "${MEDIAWIKI_PASSWORD:-CHANGE_ME}"
|
||||
MEDIAWIKI_CATEGORY_EXERCISES: "${MEDIAWIKI_CATEGORY_EXERCISES:-Übungen}"
|
||||
MEDIAWIKI_CATEGORY_SKILLS: "${MEDIAWIKI_CATEGORY_SKILLS:-Fähigkeitsbeschreibung}"
|
||||
MEDIAWIKI_CATEGORY_METHODS: "${MEDIAWIKI_CATEGORY_METHODS:-Methodenbeschreibung}"
|
||||
MEDIAWIKI_CATEGORY_MODELS: "${MEDIAWIKI_CATEGORY_MODELS:-Reifegradmodelle}"
|
||||
volumes:
|
||||
- dev-shinkan-media:/app/media
|
||||
ports:
|
||||
|
||||
Reference in new issue
Block a user