From e85e4a0e1be10aa141b9e6242ca69aae1f9356c4 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 27 Aug 2020 19:30:18 +0530 Subject: [PATCH 1/2] Merge pull request #4823 from topcoder-platform/issue-4575-hotfix Challenge Listing - Fix TCO19 filter From 25508b6425c77346ff7177c809cf86939928e5da Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Mon, 31 Aug 2020 12:42:59 +0530 Subject: [PATCH 2/2] ci: set env var COMMUNITY_APP_URL --- Dockerfile | 3 +++ build.sh | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49e686a794..59d39c94bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,6 +64,8 @@ ARG TC_M2M_AUTH0_PROXY_SERVER_URL ARG TC_M2M_AUTH0_URL ARG AUTH_SECRET +ARG COMMUNITY_APP_URL + ################################################################################ # Setting of environment variables in the Docker image. @@ -117,6 +119,7 @@ ENV CONTENTFUL_EDU_SPACE_ID=$CONTENTFUL_EDU_SPACE_ID ENV CONTENTFUL_EDU_CDN_API_KEY=$CONTENTFUL_EDU_CDN_API_KEY ENV CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY ENV RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY +ENV COMMUNITY_APP_URL=$COMMUNITY_APP_URL ################################################################################ # Testing and build of the application inside the container. diff --git a/build.sh b/build.sh index 64affb8170..8c4660937b 100755 --- a/build.sh +++ b/build.sh @@ -43,7 +43,8 @@ docker build -t $TAG \ --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 \ - --build-arg RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY . + --build-arg RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY \ + --build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL . # Copies "node_modules" from the created image, if necessary for caching. docker create --name app $TAG