Merge pull request #226 from American-Institutes-for-Research/DATA-5021/fix_local_minio

Remove forced use of env.example in Docker Compose - see DATA-5021

Author: rhunwicks

docker-compose.override.yml

@@ -26,9 +26,6 @@ services:
       - /usr/src/app/jupyter
       - /usr/src/app/log
       - /usr/src/app/media
-      # Ignore the local .env file, to avoid it conflicting with variables set
-      # in the docker-compose.yml file, particularly by Dagster
-      - ./env.example:/usr/src/app/.env
     environment:
       DJANGO_SETTINGS_MODULE: hea.settings.local
       LAUNCHER: ${LAUNCHER}  # e.g. "debugpy" or "ddtrace"
@@ -54,9 +51,6 @@ services:
       - /usr/src/app/jupyter
       - /usr/src/app/log
       - /usr/src/app/media
-      # Ignore the local .env file, to avoid it conflicting with variables set
-      # in the docker-compose.yml file, particularly by Dagster
-      - ./env.example:/usr/src/app/.env
     environment:
       DJANGO_SETTINGS_MODULE: hea.settings.local
       LAUNCHER: ${LAUNCHER}  # e.g. "debugpy" or "ddtrace"
@@ -75,9 +69,6 @@ services:
       - /usr/src/app/jupyter
       - /usr/src/app/log
       - /usr/src/app/media
-      # Ignore the local .env file, to avoid it conflicting with variables set
-      # in the docker-compose.yml file, particularly by Dagster
-      - ./env.example:/usr/src/app/.env
     environment:
       DJANGO_SETTINGS_MODULE: hea.settings.local
       LAUNCHER: ${LAUNCHER}  # e.g. "debugpy" or "ddtrace"

docker-compose.yml

@@ -101,6 +101,9 @@ services:
       DAGSTER_ASSET_BASE_PATH: ${DAGSTER_ASSET_BASE_PATH}
       DAGSTER_WEBSERVER_URL: ${DAGSTER_WEBSERVER_URL}
       DAGSTER_WEBSERVER_PREFIX: pipelines
+      DAGSTER_S3_BUCKET: ${DAGSTER_S3_BUCKET}
+      DAGSTER_S3_PREFIX: ${DAGSTER_S3_PREFIX}
+      DAGSTER_S3_LOG_PATH: ${DAGSTER_S3_LOG_PATH}
       AWS_ACCESS_KEY_ID: ${MINIO_ROOT_USER}
       AWS_SECRET_ACCESS_KEY: ${MINIO_ROOT_PASSWORD}
       AWS_ENDPOINT_URL_S3: ${MINIO_ENDPOINT_URL}