Pull proper content cards during docker build (mozilla#6743)

Also pull proper database during build for staging.
vchernin · Jan 23, 2019 · 17af0b5 · 17af0b5
1 parent 9949839
commit 17af0b5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py
@@ -1288,9 +1288,14 @@ def get_app_name(hostname):
     }
 }
 
+if DEV:
+    content_cards_default_branch = 'master-processed'
+else:
+    content_cards_default_branch = 'prod-processed'
+
 CONTENT_CARDS_PATH = config('CONTENT_CARDS_PATH', default=path('content_cards'))
 CONTENT_CARDS_REPO = config('CONTENT_CARDS_REPO', default='https://github.com/mozmeao/www-admin.git')
-CONTENT_CARDS_BRANCH = config('CONTENT_CARDS_BRANCH', default='master-processed')
+CONTENT_CARDS_BRANCH = config('CONTENT_CARDS_BRANCH', default=content_cards_default_branch)
 CONTENT_CARDS_URL = config('CONTENT_CARDS_URL', default=STATIC_URL)
 
 RELEASE_NOTES_PATH = config('RELEASE_NOTES_PATH', default=path('release_notes'))

diff --git a/bin/run-sync-all.sh b/bin/run-sync-all.sh
@@ -7,7 +7,8 @@ if [ ! -e ./manage.py ]; then
 fi
 
 case "$BRANCH_NAME" in
-    "stage" | "prod") ENV_FILE=prod ;;
+    "stage") ENV_FILE=stage ;;
+    "prod") ENV_FILE=prod ;;
     *) ENV_FILE=master ;;
 esac
 

diff --git a/docker/envfiles/prod.env b/docker/envfiles/prod.env
@@ -3,5 +3,6 @@ DEBUG=False
 DEV=False
 ALLOWED_HOSTS=*
 SECRET_KEY=59114b6a-2858-4caf-8878-482a24ee9542
-AWS_DB_S3_BUCKET=bedrock-db-prod
 PROD_DETAILS_STORAGE=product_details.storage.PDDatabaseStorage
+AWS_DB_S3_BUCKET=bedrock-db-prod
+CONTENT_CARDS_BRANCH=prod-processed
diff --git a/docker/envfiles/stage.env b/docker/envfiles/stage.env
@@ -0,0 +1,8 @@
+# used for fetching data for staging images
+DEBUG=False
+DEV=False
+ALLOWED_HOSTS=*
+SECRET_KEY=59114b6a-2858-4caf-8878-482a24ee9542
+PROD_DETAILS_STORAGE=product_details.storage.PDDatabaseStorage
+AWS_DB_S3_BUCKET=bedrock-db-stage
+CONTENT_CARDS_BRANCH=stage-processed