updating yaml to latest

Author: cwdcwd

.circleci/config.yml

@@ -1,79 +1,64 @@
 version: 2
 defaults: &defaults
     docker:
-      - image: docker:18.06-git        
+      - image: circleci/python:2.7-stretch-browsers
 install_dependency: &install_dependency
-          name: Installation of build and deployment dependencies.
-          command: |
-            apk update
-            apk add --no-cache bash curl
-            apk upgrade
-            apk add --no-cache jq py-pip sudo
-            sudo pip install awscli --upgrade
-            sudo pip install docker-compose
-
+  name: Installation of build and deployment dependencies.
+  command: |
+    sudo apt install jq
+    sudo pip install awscli --upgrade
+    sudo pip install docker-compose
 install_deploysuite: &install_deploysuite
-          name: Installation of install_deploysuite.
-          command: |
-            git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
-            cp ./../buildscript/master_deploy.sh .
-            cp ./../buildscript/buildenv.sh .
-            cp ./../buildscript/awsconfiguration.sh .
-
+  name: Installation of install_deploysuite.
+  command: |
+    git clone --branch v1.4 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+    cp ./../buildscript/master_deploy.sh .
+    cp ./../buildscript/buildenv.sh .
+    cp ./../buildscript/awsconfiguration.sh .
 restore_cache_settings_for_build: &restore_cache_settings_for_build
-  key: docker-node-modules-la-{{ checksum "package-lock.json" }}
+  key: docker-node-modules-{{ checksum "package-lock.json" }}
 
 save_cache_settings: &save_cache_settings
-  key: docker-node-modules-la-{{ checksum "package-lock.json" }}
+  key: docker-node-modules-{{ checksum "package-lock.json" }}
   paths:
     - node_modules
 
-run_build: &run_build
-          name: Build of Docker image
-          command: ./build.sh
-
-jobs:
-  # Build & Deploy against development backend
-  "build-dev":
-    <<: *defaults
-    steps:
+builddeploy_steps: &builddeploy_steps
       - checkout
       - setup_remote_docker
       - run: *install_dependency
       - run: *install_deploysuite
       - restore_cache: *restore_cache_settings_for_build
-      - run: *run_build
+      - run: ./build.sh ${APPNAME}
       - save_cache: *save_cache_settings
       - deploy:
           name: Running MasterScript.
           command: |
-            ./awsconfiguration.sh DEV
-            source awsenvconf 
-            ./buildenv.sh -e DEV -b dev-leaderboard-api-deployvar
+            ./awsconfiguration.sh $DEPLOY_ENV
+            source awsenvconf
+            ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
             source buildenvvar
-            ./master_deploy.sh -d ECS -e DEV -t latest -s dev-leaderboard-api-appvar -i leaderboard-api
+            ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
 
-  # Build & Deploy against production backend
+
+jobs:
+  # Build & Deploy against development backend
+  "build-dev":
+    <<: *defaults
+    environment:
+      DEPLOY_ENV: "DEV"
+      LOGICAL_ENV: "dev"
+      APPNAME: "leaderboard-api"    
+    steps: *builddeploy_steps
 
   "build-prod":
     <<: *defaults
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: *install_dependency
-      - run: *install_deploysuite
-      - restore_cache: *restore_cache_settings_for_build
-      - run: *run_build
-      - save_cache: *save_cache_settings
-      - deploy:
-          name: Running MasterScript.
-          command: |
-            ./awsconfiguration.sh PROD
-            source awsenvconf 
-            ./buildenv.sh -e PROD -b prod-leaderboard-api-deployvar
-            source buildenvvar
-            ./master_deploy.sh -d ECS -e PROD -t latest -s prod-leaderboard-api-appvar -i leaderboard-api
-   
+    environment:
+      DEPLOY_ENV: "PROD"
+      LOGICAL_ENV: "prod"    
+      APPNAME: "leaderboard-api"  
+    steps: *builddeploy_steps
+
 workflows:
   version: 2
   build:
@@ -83,10 +68,13 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: ["develop","circleci"]
+              only:
+                - develop
+
+      # Production builds are exectuted only on tagged commits to the
+      # master branch.
       - "build-prod":
-          context : org-global      
+          context : org-global
           filters:
             branches:
-              only:
-                - master
+              only: master