Merge pull request #502 from datacamp/fs/update-ci

Fs/update ci

Author: Filip Schouwenaars

.circleci/config.yml

@@ -13,26 +13,39 @@ workflows:
           aws-secret-access-key: $OPS_AWS_SECRET_ACCESS_KEY
           account-url: $OPS_ECR_URL
           puller-account-ids: '["301258414863", "487088987264"]'
+          extra-docker-args: "--build-arg VERSION=$(git describe --tags)"
           repo: rdoc-app
+          executor: datacamp-ecr/buildkit
+          filters:
+            branches:
+              only:
+                - master
+            tags:
+              only: /^v\d+\.\d+\.\d+$/
       - datacamp-deploy/deploy: # Staging
+          name: deploy-staging
           context: org-global
           requires:
             - build
           environment: staging
           aws-access-key-id: $STAGING_AWS_ACCESS_KEY_ID
           aws-secret-access-key: $STAGING_AWS_SECRET_ACCESS_KEY
+          extra-env: "VERSION=$(git describe --tags)"
           filters:
             branches:
               only:
                 - master
       - datacamp-deploy/deploy: # Production
+          name: deploy-production
           context: org-global
           requires:
             - build
           environment: prod
           aws-access-key-id: $PROD_AWS_ACCESS_KEY_ID
           aws-secret-access-key: $PROD_AWS_SECRET_ACCESS_KEY
+          extra-env: "VERSION=$(git describe --tags)"
           filters:
+            tags:
+              only: /^v\d+\.\d+\.\d+$/
             branches:
-              only:
-                - master
+              ignore: /.*/

Dockerfile

@@ -1,12 +1,14 @@
 FROM node:8.16
 
-MAINTAINER Ludovic Vannoorenberghe <ludo@datacamp.com>
-
 RUN apt-get update && apt-get install -y python build-essential
 
 RUN npm install -g pm2 node-gyp sails grunt bower jake npm-check-updates
 
+ARG VERSION
+ENV VERSION=${VERSION}
+
 ENV NODE_ENV production
+
 # use changes to package.json to force Docker not to use the cache
 # when we change our application's nodejs dependencies:
 ADD package.json /tmp/package.json

README.md

@@ -48,11 +48,11 @@ follow these steps:
 4. `ALTER USER 'root' IDENTIFIED WITH mysql_native_password BY 'password';`
 5. `flush privileges;`
 
-## How to deploy
 
-- To deploy to stating (rdocumentation.datacamp-staging.com), merge to master
-- To deploy to production, add a tag which starts with `release-`
-The rdocumentation app is hosted on DataCamp's infrastructure, on our AWS ECS cluster.
+## Deployment
+
+- Commits to master are deployed to staging
+- Tags that use `vx.y.z` are deployed to production
 
 ## What the CI does
 

ecs.json

@@ -52,7 +52,7 @@
         },
         {
           "containerName": "rdoc-app-sqsd",
-          "containerURI": "filipsch/sqsd:latest",
+          "containerURI": "708371444347.dkr.ecr.us-east-1.amazonaws.com/sqsd:latest",
           "memoryReservation": 128,
           "essential": true,
           "containerCommand": [