Merge pull request #4 from topcoder-platform/devverify

Devverify to dev

Author: nkumar-topcoder

.circleci/config.yml

@@ -28,9 +28,17 @@ builddeploy_steps: &builddeploy_steps
   - setup_remote_docker
   - run: *install_dependency
   - run: *install_deploysuite
-  - restore_cache: *restore_cache_settings_for_build
-  - run: ./build.sh ${APPNAME}
-  - save_cache: *save_cache_settings
+  #- restore_cache: *restore_cache_settings_for_build
+  - run: 
+      command: |
+        ./awsconfiguration.sh $DEPLOY_ENV
+        source awsenvconf
+        ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-buildvar
+  - run: 
+      command: |
+        source buildenvvar
+        ./build.sh ${APPNAME}      
+  #- save_cache: *save_cache_settings
   - deploy:
       name: Running MasterScript.
       command: |
@@ -40,6 +48,12 @@ builddeploy_steps: &builddeploy_steps
         source buildenvvar
         ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
 
+        #For mock server
+        echo "Running Masterscript - For mock server"
+        ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-mock-${APPNAME}-deployvar
+        source buildenvvar
+        ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-mock-${APPNAME}-appvar -i mock-${APPNAME}
+
 jobs:
   # Build & Deploy against development backend
   "build-dev":
@@ -69,6 +83,7 @@ workflows:
             branches:
               only:
                 - dev
+                - devverify
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

build.sh

@@ -3,22 +3,26 @@ set -eo pipefail
 APP_NAME=$1
 UPDATE_CACHE=""
 
-docker build -f docker/Dockerfile -t $APP_NAME:latest .
+docker build -f docker/Dockerfile -t $APP_NAME:latest \
+--build-arg APPMODE=$APPMODE \
+--build-arg APPENV=$APPENV .
 
-docker create --name app $APP_NAME:latest
+docker build -f docker/mockDockerfile -t mock-$APP_NAME:latest .
 
-if [ -d node_modules ]
-then
-  mv package-lock.json old-package-lock.json
-  docker cp app:/$APP_NAME/package-lock.json package-lock.json
-  set +eo pipefail
-  UPDATE_CACHE=$(cmp package-lock.json old-package-lock.json)
-  set -eo pipefail
-else
-  UPDATE_CACHE=1
-fi
+#docker create --name app $APP_NAME:latest
 
-if [ "$UPDATE_CACHE" == 1 ]
-then
-  docker cp app:/$APP_NAME/node_modules .
-fi
+#if [ -d node_modules ]
+#then
+#  mv package-lock.json old-package-lock.json
+#  docker cp app:/$APP_NAME/package-lock.json package-lock.json
+#  set +eo pipefail
+#  UPDATE_CACHE=$(cmp package-lock.json old-package-lock.json)
+#  set -eo pipefail
+#else
+#  UPDATE_CACHE=1
+#fi
+
+#if [ "$UPDATE_CACHE" == 1 ]
+#then
+#  docker cp app:/$APP_NAME/node_modules .
+#fi

config/development.js

@@ -7,7 +7,7 @@ module.exports = {
   /**
    * Topcoder Teams Service base URL
    */
-  TC_TEAMS_SERVICE_URL: "http://localhost:8502",
+  TC_TEAMS_SERVICE_URL: "https://api.topcoder-dev.com/taasmock",
 
   /**
    * URL of Topcoder Community Website

config/production.js

@@ -7,7 +7,7 @@ module.exports = {
   /**
    * Topcoder Teams Service base URL
    */
-  TC_TEAMS_SERVICE_URL: "http://localhost:8502",
+  TC_TEAMS_SERVICE_URL: "http://localhost:8502/taasmock",
 
   /**
    * URL of Topcoder Community Website

docker/Dockerfile

@@ -1,11 +1,17 @@
 # Use the base image with Node.js
 FROM node:latest
 
+ARG APPMODE
+ARG APPENV
+
+ENV APPMODE=$APPMODE
+ENV APPENV=$APPENV
+
 # Copy the current directory into the Docker image
-COPY . /micro-frontends-teams
+COPY . /taas-app
 
 # Set working directory for future use
-WORKDIR /micro-frontends-teams
+WORKDIR /taas-app
 
 # Install the dependencies from package.json
 RUN npm install

docker/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
-  micro-frontends-teams:
-    image: micro-frontends-teams:latest
+  taas-app:
+    image: taas-app:latest
     build:
       context: ../
       dockerfile: docker/Dockerfile

docker/mockDockerfile

@@ -0,0 +1,14 @@
+# Use the base image with Node.js
+FROM node:latest
+
+# Copy the current directory into the Docker image
+COPY . /taas-app
+
+# Set working directory for future use
+WORKDIR /taas-app/local/mock-server
+
+# Install the dependencies from package.json
+
+RUN npm install
+
+CMD npm start

local/mock-server/index.js

@@ -45,7 +45,7 @@ router.render = (req, res) => {
   }
 };
 
-server.use(router);
+server.use('/taasmock', router);
 
 server.listen(PORT, () => {
   console.log(`JSON Server is running on port ${PORT}`); // eslint-disable-line no-console

package.json

@@ -4,7 +4,7 @@
     "start": "node server.js",
     "dev": "webpack-dev-server --port 8501 --host 0.0.0.0",
     "dev-https": "webpack-dev-server --https --port 8501 --host 0.0.0.0",
-    "build": "webpack --mode=production",
+    "build": "webpack --mode=${APPMODE:-development} --env.config=${APPENV:-dev}",
     "analyze": "webpack --mode=production --env.analyze=true",
     "lint": "eslint src --ext js",
     "format": "prettier --write \"./**\"",

server.js

@@ -4,7 +4,7 @@ const express = require("express");
 
 const app = express();
 
-app.use('/react',
+app.use('/taas-app',
   express.static("./dist", {
     setHeaders: function setHeaders(res) {
       res.header("Access-Control-Allow-Origin", "*");