From c3dc241e5947997cf01f44591ecf912110fe216d Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Wed, 17 Apr 2019 15:47:43 +0530
Subject: [PATCH 1/2] Update config.yml

[skip ci]
---
 .circleci/config.yml | 108 +++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 51 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0a788268..ed25f599 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,43 @@
 version: 2
+python_env: &python_env
+  docker:
+    - image: circleci/python:2.7-stretch-browsers
+    
+install_awscli: &install_awscli
+  name: "Install awscli"
+  command: |
+    sudo pip install awscli --upgrade
+install_deploysuite: &install_deploysuite
+          name: Installation of install_deploysuite.
+          command: |
+            git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+            cp ./../buildscript/master_deploy.sh .
+            cp ./../buildscript/buildenv.sh .
+            cp ./../buildscript/awsconfiguration.sh .
+            
+# Instructions of deployment
+deploy_steps: &deploy_steps
+  - checkout
+  - attach_workspace:
+      at: ./workspace
+  - run: *install_awscli
+  - run: *install_deploysuite
+  - setup_remote_docker
+  - run: docker build -t tc-project-service:latest .
+  - deploy:
+      name: "Running Masterscript -  deploy tc-project-service " 
+      command: |
+        ./awsconfiguration.sh $DEPLOY_ENV  
+        source awsenvconf
+        ./buildenv.sh -e $DEPLOY_ENV -b ${VAR_ENV}-tc-project-service-deployvar
+        source buildenvvar
+        ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${VAR_ENV}-global-appvar,${VAR_ENV}-tc-project-service-appvar -i tc-project-service -p FARGATE 
+        echo "======= Running Masterscript - deploy tc-project-service-consumers ==========="
+        if [ -e ${VAR_ENV}-tc-project-service-appvar.json ]; then  sudo rm -vf ${VAR_ENV}-tc-project-service-appvar.json; fi
+        ./buildenv.sh -e $DEPLOY_ENV -b ${VAR_ENV}-tc-project-service-consumers-deployvar
+        source buildenvvar
+        ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${VAR_ENV}-global-appvar,${VAR_ENV}-tc-project-service-appvar -i tc-project-service -p FARGATE
+        
 jobs:
   test:
     docker:
@@ -30,70 +69,37 @@ jobs:
           root: .
           paths:
             - dist
-  deployDev:
-    docker:
-      - image: docker:17.06.1-ce-git
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Installation of build dependencies.
-          command: apk add --no-cache bash
-      - attach_workspace:
-          at: ./workspace
-      - run:
-          name: Installing AWS client
-          command: |
-            apk add --no-cache jq py-pip sudo
-            sudo pip install awscli --upgrade
-      - run:
-          name: Building
-          command: |
-            set +e
-            ./build.sh DEV
-      - run:
-          name: Deploying
-          command: |
-            ./deploy.sh DEV
+            
   deployProd:
-    docker:
-      - image: docker:17.06.1-ce-git
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Installation of build dependencies.
-          command: apk add --no-cache bash
-      - attach_workspace:
-          at: ./workspace
-      - run:
-          name: Installing AWS client
-          command: |
-            apk add --no-cache jq py-pip sudo
-            sudo pip install awscli --upgrade
-      - run:
-          name: Building
-          command: |
-            set +e
-            ./build.sh PROD
-      - run:
-          name: Deploying
-          command: |
-            ./deploy.sh PROD
+    <<: *python_env
+    environment:
+      DEPLOY_ENV: "PROD"
+      VAR_ENV: "prod"
+    steps: *deploy_steps
+
+  deployDev:
+    <<: *python_env
+    environment:
+      DEPLOY_ENV: "DEV"
+      VAR_ENV: "dev"
+    steps: *deploy_steps 
+    
 workflows:
   version: 2
   build:
     jobs:
       - test
       - deployDev:
+          context : org-global
           requires:
             - test
           filters:
             branches:
-              only: ['dev', 'feature/attachmentPermissions']
+              only: ['dev', 'dev-sts']
       - deployProd:
+          context : org-global
           requires:
             - test
           filters:
             branches:
-              only: 'master'
+              only: ['master']

From cdb14a6b5d89daeb470f26db9131614d3a3774b9 Mon Sep 17 00:00:00 2001
From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com>
Date: Wed, 17 Apr 2019 15:48:52 +0530
Subject: [PATCH 2/2] Update Dockerfile

[skip ci]
---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index a59f1239..f8e90f49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM node:8.2.1
 LABEL version="1.2"
 LABEL description="Projects microservice"
+RUN sed -i '/jessie-updates/d' /etc/apt/sources.list
 
 RUN apt-get update && \
     apt-get upgrade -y