From c6187466a3d7ada8b7e08e1a44b4d4b40a258ab3 Mon Sep 17 00:00:00 2001 From: dandds Date: Mon, 18 Nov 2019 11:22:39 -0500 Subject: [PATCH] Configure staging with different FLASK_ENV, include sub-route for CDN_URL. --- .circleci/config.yml | 4 ++-- deploy/overlays/staging/envvars.yml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a962400f..1374452f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,14 +145,14 @@ jobs: - image: docker:18.06.0-ce-git steps: - docker-build: - cdn_url: https://atat-cdn-staging.azureedge.net/ + cdn_url: https://atat-cdn-staging.azureedge.net/static/assets docker-build-master: docker: - image: docker:18.06.0-ce-git steps: - docker-build: - cdn_url: https://atat-cdn.azureedge.net/ + cdn_url: https://atat-cdn.azureedge.net/static/assets test: docker: diff --git a/deploy/overlays/staging/envvars.yml b/deploy/overlays/staging/envvars.yml index abbd10c9..86ea42b7 100644 --- a/deploy/overlays/staging/envvars.yml +++ b/deploy/overlays/staging/envvars.yml @@ -6,6 +6,7 @@ metadata: data: CELERY_DEFAULT_QUEUE: celery-staging SERVER_NAME: staging.atat.code.mil + FLASK_ENV: staging --- apiVersion: v1 kind: ConfigMap @@ -14,4 +15,5 @@ metadata: data: ASSETS_URL: https://atat-cdn-staging.azureedge.net/ CELERY_DEFAULT_QUEUE: celery-staging + FLASK_ENV: staging STATIC_URL: https://atat-cdn-staging.azureedge.net/static/