Merge a3be5e3 into 39d5c26

LibraryOfCongress · Jan 28, 2019 · 64d9347 · 64d9347
2 parents 39d5c26 + a3be5e3
commit 64d9347
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -20,6 +20,8 @@ ENV LANGUAGE=en_US.UTF-8
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONPATH /app
 
+ENV DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-concordia.settings_docker}
+
 RUN pip3 install pipenv
 
 WORKDIR /app

diff --git a/celerybeat/Dockerfile b/celerybeat/Dockerfile
@@ -19,7 +19,8 @@ ENV LANGUAGE=en_US.UTF-8
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONPATH /app
-ENV DJANGO_SETTINGS_MODULE=concordia.settings_prod
+
+ENV DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-concordia.settings_docker}
 
 RUN pip3 install pipenv
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -51,6 +51,9 @@ services:
         environment:
             POSTGRESQL_HOST: db
             POSTGRESQL_PW: ${POSTGRESQL_PW}
+            S3_BUCKET_NAME: crowd-dev-content
+            DJANGO_SETTINGS_MODULE: concordia.settings_docker
+            DEBUG: ${DEBUG:-}
         depends_on:
             - redis
             - db
@@ -63,7 +66,10 @@ services:
             dockerfile: indexer/Dockerfile
         environment:
             POSTGRESQL_HOST: db
+            POSTGRESQL_PW: ${POSTGRESQL_PW}
             ELASTICSEARCH_ENDPOINT: http://localhost:9200
+            DJANGO_SETTINGS_MODULE: concordia.settings_docker
+            DEBUG: ${DEBUG:-}
         depends_on:
             - db
 
@@ -74,6 +80,8 @@ services:
         environment:
             POSTGRESQL_HOST: db
             POSTGRESQL_PW: ${POSTGRESQL_PW}
+            DJANGO_SETTINGS_MODULE: concordia.settings_docker
+            DEBUG: ${DEBUG:-}
         depends_on:
             - redis
             - db

diff --git a/importer/Dockerfile b/importer/Dockerfile
@@ -18,7 +18,8 @@ ENV LANGUAGE=en_US.UTF-8
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONPATH /app
-ENV DJANGO_SETTINGS_MODULE=concordia.settings_prod
+
+ENV DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-concordia.settings_docker}
 
 RUN pip3 install pipenv
 

diff --git a/indexer/Dockerfile b/indexer/Dockerfile
@@ -18,7 +18,8 @@ ENV LANGUAGE=en_US.UTF-8
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONPATH /app
-ENV DJANGO_SETTINGS_MODULE=concordia.settings_prod
+
+ENV DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-concordia.settings_docker}
 
 ENV ELASTICSEARCH_DSL_AUTOSYNC=True