Skip to content

Commit 3692d7b

Browse files
Merge pull request #5358 from topcoder-platform/gsheet-contentful-develop
Gsheet contentful develop
2 parents 799ff74 + 48b92f3 commit 3692d7b

File tree

18 files changed

+1135
-295
lines changed

18 files changed

+1135
-295
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ workflows:
282282
filters:
283283
branches:
284284
only:
285-
- free
285+
- gsheet-contentful-develop
286286
# This is alternate dev env for parallel testing
287287
- "build-qa":
288288
context : org-global

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ ARG TC_M2M_AUTH0_URL
6565
ARG AUTH_SECRET
6666

6767
ARG COMMUNITY_APP_URL
68+
ARG GSHEETS_API_KEY
6869

6970
################################################################################
7071
# Setting of environment variables in the Docker image.
@@ -120,6 +121,7 @@ ENV CONTENTFUL_EDU_CDN_API_KEY=$CONTENTFUL_EDU_CDN_API_KEY
120121
ENV CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY
121122
ENV RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY
122123
ENV COMMUNITY_APP_URL=$COMMUNITY_APP_URL
124+
ENV GSHEETS_API_KEY=$GSHEETS_API_KEY
123125

124126
################################################################################
125127
# Testing and build of the application inside the container.

build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ docker build -t $TAG \
4444
--build-arg CONTENTFUL_COMCAST_CDN_API_KEY=$CONTENTFUL_COMCAST_CDN_API_KEY \
4545
--build-arg CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY \
4646
--build-arg RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY \
47+
--build-arg GSHEETS_API_KEY=$GSHEETS_API_KEY \
4748
--build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL .
4849

4950
# Copies "node_modules" from the created image, if necessary for caching.

config/custom-environment-variables.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,5 @@ module.exports = {
104104
AUTH0_PROXY_SERVER_URL: 'TC_M2M_AUTH0_PROXY_SERVER_URL',
105105
TOKEN_CACHE_TIME: 'TOKEN_CACHE_TIME',
106106
},
107+
GSHEETS_API_KEY: 'GSHEETS_API_KEY',
107108
};

config/default.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ module.exports = {
249249
RECRUITCRM_API_KEY: '',
250250
},
251251

252+
GSHEETS_API_KEY: 'AIzaSyBRdKySN5JNCb2H6ZxJdTTvp3cWU51jiOQ',
253+
252254
AUTH_CONFIG: {
253255
AUTH0_URL: 'TC_M2M_AUTH0_URL',
254256
AUTH0_AUDIENCE: 'TC_M2M_AUDIENCE',

0 commit comments

Comments
 (0)