Skip to content

Comcast community #4187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 7, 2020
Merged

Comcast community #4187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8373852
ci: deploying on beta
sushilshinde Apr 6, 2020
7efe4b1
Fixed Docke and build files
kkartunov Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ workflows:
branches:
only:
- develop
- comcast-community
# Production builds are exectuted only on tagged commits to the
# master branch.
- "build-prod":
Expand Down
10 changes: 10 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
5 changes: 4 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down