From 423bbcf1d8b2a797a22f95550dc47c91135e668c Mon Sep 17 00:00:00 2001
From: LieutenantRoger <gair_2015@hotmail.com>
Date: Thu, 3 Feb 2022 23:01:14 +0800
Subject: [PATCH 1/4] read value from build env

---
 build.sh          | 4 +++-
 config/dev.js     | 6 ++----
 config/prod.js    | 6 ++----
 docker/Dockerfile | 4 ++++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/build.sh b/build.sh
index 2c0184f..a737cda 100755
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,9 @@ UPDATE_CACHE=""
 
 docker build -f docker/Dockerfile -t $APP_NAME:latest \
 --build-arg APPMODE=$APPMODE \
---build-arg APPENV=$APPENV .
+--build-arg APPENV=$APPENV \
+--build-arg FILESTACK_API_KEY=$FILESTACK_API_KEY \
+--build-arg FILESTACK_SUBMISSION_CONTAINER=$FILESTACK_SUBMISSION_CONTAINER .
 
 docker create --name app $APP_NAME:latest
 
diff --git a/config/dev.js b/config/dev.js
index 632f11b..b763e83 100644
--- a/config/dev.js
+++ b/config/dev.js
@@ -133,11 +133,9 @@ module.exports = {
   /* Filestack configuration for uploading Submissions
    * These are for the development back end */
   FILESTACK: {
-    API_KEY: process.env.FILESTACK_API_KEY || "AzFINuQoqTmqw0QEoaw9az",
+    API_KEY: process.env.FILESTACK_API_KEY,
     REGION: "us-east-1",
-    SUBMISSION_CONTAINER:
-      process.env.FILESTACK_SUBMISSION_CONTAINER ||
-      "topcoder-dev-submissions-dmz",
+    SUBMISSION_CONTAINER: process.env.FILESTACK_SUBMISSION_CONTAINER
   },
   /* Time in MS to wait before refreshing challenge details after register
    * and unregister.  Used to allow API sufficent time to update.
diff --git a/config/prod.js b/config/prod.js
index bb2f09b..e8f0778 100644
--- a/config/prod.js
+++ b/config/prod.js
@@ -128,11 +128,9 @@ module.exports = {
     DEFAULT_ENVIRONMENT: "master",
   },
   FILESTACK: {
-    API_KEY: process.env.FILESTACK_API_KEY || "AzFINuQoqTmqw0QEoaw9az",
+    API_KEY: process.env.FILESTACK_API_KEY,
     REGION: "us-east-1",
-    SUBMISSION_CONTAINER:
-      process.env.FILESTACK_SUBMISSION_CONTAINER ||
-      "topcoder-dev-submissions-dmz",
+    SUBMISSION_CONTAINER: process.env.FILESTACK_SUBMISSION_CONTAINER
   },
   /* Time in MS to wait before refreshing challenge details after register
    * and unregister.  Used to allow API sufficent time to update.
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 98ad721..80b4376 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,9 +3,13 @@ FROM node:10.22.1
 
 ARG APPMODE
 ARG APPENV
+ARG FILESTACK_API_KEY
+ARG FILESTACK_SUBMISSION_CONTAINER
 
 ENV APPMODE=$APPMODE
 ENV APPENV=$APPENV
+ENV FILESTACK_API_KEY=$FILESTACK_API_KEY
+ENV FILESTACK_SUBMISSION_CONTAINER=$FILESTACK_SUBMISSION_CONTAINER
 
 # Copy the current directory into the Docker image
 COPY . /micro-frontends-challenges-app

From d6dd23dfe76b27a1e4532324ff8c0a20b6aa19e7 Mon Sep 17 00:00:00 2001
From: LieutenantRoger <gair_2015@hotmail.com>
Date: Thu, 3 Feb 2022 23:01:46 +0800
Subject: [PATCH 2/4] read filestack key from env

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21fcb93..3933d98 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -76,7 +76,7 @@ workflows:
           filters:
             branches:
               only:
-                - dev
+                - fix-file-stack-key
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

From e36d3158d7c587bb5ed4b0d54fce41ee65d63c77 Mon Sep 17 00:00:00 2001
From: LieutenantRoger <gair_2015@hotmail.com>
Date: Thu, 3 Feb 2022 23:43:36 +0800
Subject: [PATCH 3/4] redeploying

---
 webpack.config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webpack.config.js b/webpack.config.js
index dbe5525..89ee208 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -116,6 +116,8 @@ module.exports = (webpackConfigEnv) => {
           ..._.mapValues(config, (value) => JSON.stringify(value)),
           APPENV: JSON.stringify(process.env.APPENV),
           APPMODE: JSON.stringify(process.env.APPMODE),
+          FILESTACK_API_KEY: JSON.stringify(process.env.FILESTACK_API_KEY),
+          FILESTACK_SUBMISSION_CONTAINER: JSON.stringify(process.env.FILESTACK_SUBMISSION_CONTAINER),
         },
       }),
     ],

From e370d5140d2eab92e731869c3a0b33b54c401891 Mon Sep 17 00:00:00 2001
From: LieutenantRoger <gair_2015@hotmail.com>
Date: Fri, 4 Feb 2022 00:19:07 +0800
Subject: [PATCH 4/4] restore ci

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3933d98..21fcb93 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -76,7 +76,7 @@ workflows:
           filters:
             branches:
               only:
-                - fix-file-stack-key
+                - dev
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.