chore: centralize docker-compose variables into .env
All checks were successful
Deploy to Staging / Build Images (push) Successful in 39s
Deploy to Staging / Deploy to Staging (push) Successful in 52s
Deploy to Staging / Verify Staging (push) Successful in 9s
Deploy to Staging / Notify Staging Ready (push) Successful in 8s
Deploy to Staging / Notify Staging Failure (push) Has been skipped
All checks were successful
Deploy to Staging / Build Images (push) Successful in 39s
Deploy to Staging / Deploy to Staging (push) Successful in 52s
Deploy to Staging / Verify Staging (push) Successful in 9s
Deploy to Staging / Notify Staging Ready (push) Successful in 8s
Deploy to Staging / Notify Staging Failure (push) Has been skipped
Stripe Price IDs were hardcoded and duplicated across 4 compose files.
Log levels were hardcoded per-overlay instead of using generate-log-config.sh.
This refactors all environment-specific variables into a single .env file
that CI/CD generates from Gitea repo variables + generate-log-config.sh.
- Add .env.example template with documented variables
- Replace hardcoded values with ${VAR:-default} substitution in base compose
- Simplify prod overlay from 90 to 32 lines (remove redundant env blocks)
- Add YAML anchors to blue-green overlay (eliminate blue/green duplication)
- Remove redundant OCR env block from staging overlay
- Change generate-log-config.sh to output to stdout (pipe into .env)
- Update staging/production CI/CD to generate .env with Stripe + log vars
- Remove dangerous pk_live_ default from VITE_STRIPE_PUBLISHABLE_KEY
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -11,8 +11,9 @@ services:
|
||||
command:
|
||||
- --configFile=/etc/traefik/traefik.yml
|
||||
environment:
|
||||
# Traefik log levels: TRACE | DEBUG | INFO | WARN | ERROR
|
||||
LOG_LEVEL: debug
|
||||
# Traefik natively reads TRAEFIK_LOG_LEVEL (maps to --log.level)
|
||||
# Levels: TRACE | DEBUG | INFO | WARN | ERROR
|
||||
TRAEFIK_LOG_LEVEL: ${TRAEFIK_LOG_LEVEL:-DEBUG}
|
||||
CLOUDFLARE_DNS_API_TOKEN_FILE: /run/secrets/cloudflare-dns-token
|
||||
ports:
|
||||
- "80:80"
|
||||
@@ -60,7 +61,7 @@ services:
|
||||
VITE_AUTH0_CLIENT_ID: ${VITE_AUTH0_CLIENT_ID:-yspR8zdnSxmV8wFIghHynQ08iXAPoQJ3}
|
||||
VITE_AUTH0_AUDIENCE: ${VITE_AUTH0_AUDIENCE:-https://api.motovaultpro.com}
|
||||
VITE_API_BASE_URL: ${VITE_API_BASE_URL:-/api}
|
||||
VITE_STRIPE_PUBLISHABLE_KEY: ${VITE_STRIPE_PUBLISHABLE_KEY:-pk_live_51Sr2yQJk87CpWj04YNBIaUWUtnJjeVTgk5NqHdpjqxgsbjy3dMKkIsqhjcpSkCzp3KvLi23BGgxhwV021EnEW3H400HhPYVyfN}
|
||||
VITE_STRIPE_PUBLISHABLE_KEY: ${VITE_STRIPE_PUBLISHABLE_KEY}
|
||||
container_name: mvp-frontend
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
@@ -115,20 +116,15 @@ services:
|
||||
CONFIG_PATH: /app/config/production.yml
|
||||
SECRETS_DIR: /run/secrets
|
||||
# Pino log levels: trace | debug | info | warn | error | fatal
|
||||
LOG_LEVEL: debug
|
||||
LOG_LEVEL: ${BACKEND_LOG_LEVEL:-debug}
|
||||
# Service references
|
||||
DATABASE_HOST: mvp-postgres
|
||||
REDIS_HOST: mvp-redis
|
||||
# Production Variables
|
||||
#STRIPE_PRO_MONTHLY_PRICE_ID: prod_Toj6BG9Z9JwREl
|
||||
#STRIPE_PRO_YEARLY_PRICE_ID: prod_Toj8oo0RpVBQmB
|
||||
#STRIPE_ENTERPRISE_MONTHLY_PRICE_ID: prod_Toj8xGEui9jl6j
|
||||
#STRIPE_ENTERPRISE_YEARLY_PRICE_ID: prod_Toj9A7A773xrdn
|
||||
# Sandbox Variables
|
||||
STRIPE_PRO_MONTHLY_PRICE_ID: price_1T1ZHMJXoKkh5RcKwKSSGIlR
|
||||
STRIPE_PRO_YEARLY_PRICE_ID: price_1T1ZHnJXoKkh5RcKWlG2MPpX
|
||||
STRIPE_ENTERPRISE_MONTHLY_PRICE_ID: price_1T1ZIBJXoKkh5RcKu2jyhqBN
|
||||
STRIPE_ENTERPRISE_YEARLY_PRICE_ID: price_1T1ZIQJXoKkh5RcK34YXiJQm
|
||||
# Stripe Price IDs (override via .env for staging/production)
|
||||
STRIPE_PRO_MONTHLY_PRICE_ID: ${STRIPE_PRO_MONTHLY_PRICE_ID:-price_1T1ZHMJXoKkh5RcKwKSSGIlR}
|
||||
STRIPE_PRO_YEARLY_PRICE_ID: ${STRIPE_PRO_YEARLY_PRICE_ID:-price_1T1ZHnJXoKkh5RcKWlG2MPpX}
|
||||
STRIPE_ENTERPRISE_MONTHLY_PRICE_ID: ${STRIPE_ENTERPRISE_MONTHLY_PRICE_ID:-price_1T1ZIBJXoKkh5RcKu2jyhqBN}
|
||||
STRIPE_ENTERPRISE_YEARLY_PRICE_ID: ${STRIPE_ENTERPRISE_YEARLY_PRICE_ID:-price_1T1ZIQJXoKkh5RcK34YXiJQm}
|
||||
volumes:
|
||||
# Configuration files (K8s ConfigMap equivalent)
|
||||
- ./config/app/production.yml:/app/config/production.yml:ro
|
||||
@@ -197,7 +193,7 @@ services:
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
# Python log levels: DEBUG | INFO | WARNING | ERROR | CRITICAL
|
||||
LOG_LEVEL: debug
|
||||
LOG_LEVEL: ${BACKEND_LOG_LEVEL:-debug}
|
||||
REDIS_HOST: mvp-redis
|
||||
REDIS_PORT: 6379
|
||||
REDIS_DB: 1
|
||||
@@ -244,11 +240,11 @@ services:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD_FILE: /run/secrets/postgres-password
|
||||
POSTGRES_INITDB_ARGS: --encoding=UTF8
|
||||
LOG_LEVEL: debug
|
||||
LOG_LEVEL: ${BACKEND_LOG_LEVEL:-debug}
|
||||
# PostgreSQL log statements: none | ddl | mod | all
|
||||
POSTGRES_LOG_STATEMENT: all
|
||||
POSTGRES_LOG_STATEMENT: ${POSTGRES_LOG_STATEMENT:-all}
|
||||
# Minimum query duration to log: -1 (disabled) | 0 (all) | N (ms threshold)
|
||||
POSTGRES_LOG_MIN_DURATION_STATEMENT: 0
|
||||
POSTGRES_LOG_MIN_DURATION_STATEMENT: ${POSTGRES_LOG_MIN_DURATION:-0}
|
||||
PGDATA: /var/lib/postgresql/data/pgdata
|
||||
volumes:
|
||||
- mvp_postgres_data:/var/lib/postgresql/data/pgdata
|
||||
@@ -276,7 +272,7 @@ services:
|
||||
container_name: mvp-redis
|
||||
restart: unless-stopped
|
||||
# Redis log levels: debug | verbose | notice | warning
|
||||
command: redis-server --appendonly yes --loglevel debug
|
||||
command: redis-server --appendonly yes --loglevel ${REDIS_LOGLEVEL:-debug}
|
||||
volumes:
|
||||
- mvp_redis_data:/data
|
||||
networks:
|
||||
|
||||
Reference in New Issue
Block a user