From 8373852cacae46b11717bdf4026a03bae25d7385 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 7 Apr 2020 00:08:47 +0530 Subject: [PATCH 1/2] ci: deploying on beta ci: deploying on beta --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1bd7229157..eea738d5b9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -191,6 +191,7 @@ workflows: branches: only: - develop + - comcast-community # Production builds are exectuted only on tagged commits to the # master branch. - "build-prod": From 7efe4b1defccd854fd9b40ee7e6712eaf7c24164 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Tue, 7 Apr 2020 00:28:59 +0300 Subject: [PATCH 2/2] Fixed Docke and build files --- Dockerfile | 10 ++++++++++ build.sh | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 75f93fa0eb..774e3d3248 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,11 @@ ARG CONTENTFUL_TOPGEAR_SPACE_ID ARG CONTENTFUL_TOPGEAR_CDN_API_KEY ARG CONTENTFUL_TOPGEAR_PREVIEW_API_KEY +# Credentials for access to Comcast space in Contentful CMS +ARG CONTENTFUL_COMCAST_SPACE_ID +ARG CONTENTFUL_COMCAST_CDN_API_KEY +ARG CONTENTFUL_COMCAST_PREVIEW_API_KEY + #Credentials for Contentfu EDU space ARG CONTENTFUL_MANAGEMENT_TOKEN @@ -79,6 +84,11 @@ ENV CONTENTFUL_TOPGEAR_SPACE_ID=$CONTENTFUL_TOPGEAR_SPACE_ID ENV CONTENTFUL_TOPGEAR_CDN_API_KEY=$CONTENTFUL_TOPGEAR_CDN_API_KEY ENV CONTENTFUL_TOPGEAR_PREVIEW_API_KEY=$CONTENTFUL_TOPGEAR_PREVIEW_API_KEY +# Credentials for access to Comcast space in Contentful CMS +ENV CONTENTFUL_COMCAST_SPACE_ID=$CONTENTFUL_COMCAST_SPACE_ID +ENV CONTENTFUL_COMCAST_CDN_API_KEY=$CONTENTFUL_COMCAST_CDN_API_KEY +ENV CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY + ENV FILESTACK_API_KEY=$FILESTACK_API_KEY ENV FILESTACK_SUBMISSION_CONTAINER=$FILESTACK_SUBMISSION_CONTAINER diff --git a/build.sh b/build.sh index 15b81c5c03..bb62f0c990 100755 --- a/build.sh +++ b/build.sh @@ -39,7 +39,10 @@ docker build -t $TAG \ --build-arg TC_M2M_AUTH0_PROXY_SERVER_URL=$TC_M2M_AUTH0_PROXY_SERVER_URL \ --build-arg TC_M2M_AUTH0_URL=$TC_M2M_AUTH0_URL \ --build-arg AUTH_SECRET=$AUTH_SECRET \ - --build-arg TC_M2M_GRANT_TYPE=$TC_M2M_GRANT_TYPE . + --build-arg TC_M2M_GRANT_TYPE=$TC_M2M_GRANT_TYPE \ + --build-arg CONTENTFUL_COMCAST_SPACE_ID=$CONTENTFUL_COMCAST_SPACE_ID \ + --build-arg CONTENTFUL_COMCAST_CDN_API_KEY=$CONTENTFUL_COMCAST_CDN_API_KEY \ + --build-arg CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY . # Copies "node_modules" from the created image, if necessary for caching. docker create --name app $TAG