fix: use env_file to properly inject all .env vars into containers
This commit is contained in:
+3
-25
@@ -17,28 +17,17 @@ services:
|
|||||||
web:
|
web:
|
||||||
build: .
|
build: .
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
env_file: .env
|
||||||
ports:
|
ports:
|
||||||
- "${APP_PORT:-8000}:8000"
|
- "${APP_PORT:-8000}:8000"
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
environment:
|
environment:
|
||||||
SECRET_KEY: ${SECRET_KEY}
|
|
||||||
DEBUG: ${DEBUG:-False}
|
|
||||||
ALLOWED_HOSTS: ${ALLOWED_HOSTS:-localhost}
|
|
||||||
CSRF_TRUSTED_ORIGINS: ${CSRF_TRUSTED_ORIGINS:-}
|
|
||||||
SQL_ENGINE: django.db.backends.postgresql
|
|
||||||
SQL_DATABASE: ${SQL_DATABASE:-busmanager}
|
|
||||||
SQL_USER: ${SQL_USER:-busmanager}
|
|
||||||
SQL_PASSWORD: ${SQL_PASSWORD}
|
|
||||||
SQL_HOST: db
|
SQL_HOST: db
|
||||||
SQL_PORT: 5432
|
SQL_PORT: 5432
|
||||||
STATIC_ROOT: /app/staticfiles
|
STATIC_ROOT: /app/staticfiles
|
||||||
EMAIL_HOST: ${EMAIL_HOST:-}
|
|
||||||
EMAIL_PORT: ${EMAIL_PORT:-25}
|
|
||||||
# Optional: Telstra SMS
|
|
||||||
TELSTRA_CLIENT_ID: ${TELSTRA_CLIENT_ID:-}
|
|
||||||
TELSTRA_CLIENT_SECRET: ${TELSTRA_CLIENT_SECRET:-}
|
|
||||||
volumes:
|
volumes:
|
||||||
- static_files:/app/staticfiles
|
- static_files:/app/staticfiles
|
||||||
|
|
||||||
@@ -46,6 +35,7 @@ services:
|
|||||||
cron:
|
cron:
|
||||||
build: .
|
build: .
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
env_file: .env
|
||||||
entrypoint: >
|
entrypoint: >
|
||||||
sh -c "echo '0 6 * * * python /app/manage.py nightly_check_active_status >> /proc/1/fd/1 2>&1'
|
sh -c "echo '0 6 * * * python /app/manage.py nightly_check_active_status >> /proc/1/fd/1 2>&1'
|
||||||
| crontab - && crond -f -d 8"
|
| crontab - && crond -f -d 8"
|
||||||
@@ -53,20 +43,8 @@ services:
|
|||||||
db:
|
db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
environment:
|
environment:
|
||||||
SECRET_KEY: ${SECRET_KEY}
|
|
||||||
DEBUG: ${DEBUG:-False}
|
|
||||||
ALLOWED_HOSTS: ${ALLOWED_HOSTS:-localhost}
|
|
||||||
CSRF_TRUSTED_ORIGINS: ${CSRF_TRUSTED_ORIGINS:-}
|
|
||||||
SQL_ENGINE: django.db.backends.postgresql
|
|
||||||
SQL_DATABASE: ${SQL_DATABASE:-busmanager}
|
|
||||||
SQL_USER: ${SQL_USER:-busmanager}
|
|
||||||
SQL_PASSWORD: ${SQL_PASSWORD}
|
|
||||||
SQL_HOST: db
|
SQL_HOST: db
|
||||||
SQL_PORT: 5432
|
SQL_PORT: 5432
|
||||||
EMAIL_HOST: ${EMAIL_HOST:-}
|
|
||||||
EMAIL_PORT: ${EMAIL_PORT:-25}
|
|
||||||
TELSTRA_CLIENT_ID: ${TELSTRA_CLIENT_ID:-}
|
|
||||||
TELSTRA_CLIENT_SECRET: ${TELSTRA_CLIENT_SECRET:-}
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres_data:
|
postgres_data:
|
||||||
|
|||||||
Reference in New Issue
Block a user