Merge branch 'master' into feature-contentful

Author: kkartunov

.circleci/config.yml

@@ -175,6 +175,7 @@ workflows:
             branches:
               only:
                 - develop
+                - comcast-community
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -190,6 +191,7 @@ workflows:
             branches:
               only:
                 - develop
+                - comcast-community
       # Production builds are exectuted only on tagged commits to the
       # master branch.
       - "build-prod":

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
 

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

config/custom-environment-variables.js

@@ -63,6 +63,13 @@ module.exports = {
           PREVIEW_API_KEY: 'CONTENTFUL_EDU_PREVIEW_API_KEY',
         },
       },
+      comcast: {
+        SPACE_ID: 'CONTENTFUL_COMCAST_SPACE_ID',
+        master: {
+          CDN_API_KEY: 'CONTENTFUL_COMCAST_CDN_API_KEY',
+          PREVIEW_API_KEY: 'CONTENTFUL_COMCAST_PREVIEW_API_KEY',
+        },
+      },
     },
 
     MAILCHIMP: {

config/default.js

@@ -213,6 +213,13 @@ module.exports = {
           PREVIEW_API_KEY: '',
         },
       },
+      comcast: {
+        SPACE_ID: '',
+        master: {
+          CDN_API_KEY: '',
+          PREVIEW_API_KEY: '',
+        },
+      },
     },
 
     MAILCHIMP: {