From b924c0556cce0ad9f8c59227e50606656abdb4dd Mon Sep 17 00:00:00 2001 From: Mark Veidemanis Date: Thu, 21 Mar 2024 18:42:21 +0000 Subject: [PATCH] Nuclear-grade workaround --- docker-compose.prod.yml | 61 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 6a52f86..20fd566 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -15,8 +15,25 @@ services: - app_static:${STATIC_ROOT} #ports: # - "8000:8000" # uwsgi socket - env_file: - - /opt/containers/drugs/stack.env + # I don't like this any more than you do + environment: + APP_PORT: "${APP_PORT}" + REPO_DIR: "${REPO_DIR}" + STACK_FILE: "${STACK_FILE}" + APP_DATABASE_FILE: "${APP_DATABASE_FILE}" + DOMAIN: "${DOMAIN}" + URL: "${URL}" + ALLOWED_HOSTS: "${ALLOWED_HOSTS}" + NOTIFY_TOPIC: "${NOTIFY_TOPIC}" + CSRF_TRUSTED_ORIGINS: "${CSRF_TRUSTED_ORIGINS}" + DEBUG: "${DEBUG}" + SECRET_KEY: "${SECRET_KEY}" + STATIC_ROOT: "${STATIC_ROOT}" + REGISTRATION_OPEN: "${REGISTRATION_OPEN}" + OPERATION: "${OPERATION}" + PROFILER: "${PROFILER}" + BILLING_ENABLED: "${BILLING_ENABLED}" + DRUGBANK_USERNAME: "${DRUGBANK_USERNAME}" # volumes_from: # - tmp depends_on: @@ -45,8 +62,24 @@ services: - app_static:${STATIC_ROOT} # volumes_from: # - tmp - env_file: - - /opt/containers/drugs/stack.env + environment: + APP_PORT: "${APP_PORT}" + REPO_DIR: "${REPO_DIR}" + STACK_FILE: "${STACK_FILE}" + APP_DATABASE_FILE: "${APP_DATABASE_FILE}" + DOMAIN: "${DOMAIN}" + URL: "${URL}" + ALLOWED_HOSTS: "${ALLOWED_HOSTS}" + NOTIFY_TOPIC: "${NOTIFY_TOPIC}" + CSRF_TRUSTED_ORIGINS: "${CSRF_TRUSTED_ORIGINS}" + DEBUG: "${DEBUG}" + SECRET_KEY: "${SECRET_KEY}" + STATIC_ROOT: "${STATIC_ROOT}" + REGISTRATION_OPEN: "${REGISTRATION_OPEN}" + OPERATION: "${OPERATION}" + PROFILER: "${PROFILER}" + BILLING_ENABLED: "${BILLING_ENABLED}" + DRUGBANK_USERNAME: "${DRUGBANK_USERNAME}" collectstatic: image: xf/drugs:prod @@ -62,8 +95,24 @@ services: - app_static:${STATIC_ROOT} # volumes_from: # - tmp - env_file: - - /opt/containers/drugs/stack.env + environment: + APP_PORT: "${APP_PORT}" + REPO_DIR: "${REPO_DIR}" + STACK_FILE: "${STACK_FILE}" + APP_DATABASE_FILE: "${APP_DATABASE_FILE}" + DOMAIN: "${DOMAIN}" + URL: "${URL}" + ALLOWED_HOSTS: "${ALLOWED_HOSTS}" + NOTIFY_TOPIC: "${NOTIFY_TOPIC}" + CSRF_TRUSTED_ORIGINS: "${CSRF_TRUSTED_ORIGINS}" + DEBUG: "${DEBUG}" + SECRET_KEY: "${SECRET_KEY}" + STATIC_ROOT: "${STATIC_ROOT}" + REGISTRATION_OPEN: "${REGISTRATION_OPEN}" + OPERATION: "${OPERATION}" + PROFILER: "${PROFILER}" + BILLING_ENABLED: "${BILLING_ENABLED}" + DRUGBANK_USERNAME: "${DRUGBANK_USERNAME}" nginx: image: nginx:latest