bcgov · BrandonSharratt · Mar 7, 2019 · Mar 6, 2019 · Mar 6, 2019 · Mar 6, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ matrix:
       stage: "APIs"
       language: node_js
       node_js:
-       - "node"
+       - "lts/*"
       cache: npm
       addons:
        apt:
@@ -61,7 +61,9 @@ matrix:
           cd /home/travis/build/bcgov/OCWA/microservices/forumApi
           npm test
         - helm lint helm/forum-api
-        - bash docker_quayio_push
+        - |-
+          cd /home/travis/build/bcgov/OCWA/microservices/forumApi
+          bash docker_quayio_push ocwa_forum_api
         - |-
           cd /home/travis/build/bcgov/OCWA
           PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH
@@ -81,7 +83,7 @@ matrix:
       stage: "APIs"
       language: node_js
       node_js:
-        - "node"
+        - "lts/*"
       cache: npm
       addons:
         apt:
@@ -149,7 +151,9 @@ matrix:
           sleep 15
           npm test
         - helm lint helm/request-api
-        - bash docker_quayio_push
+        - |-
+          cd /home/travis/build/bcgov/OCWA/microservices/requestApi
+          bash docker_quayio_push ocwa_request_api
         - |-
           cd /home/travis/build/bcgov/OCWA
           PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH
@@ -202,11 +206,12 @@ matrix:
           cd /home/travis/build/bcgov/OCWA/microservices/policyApi
           cp config/default.json.template config/default.json
           sudo pip3 install -e .
-        - sudo pytest
         - sudo coverage run --branch --source=db,v1 -m pytest
         - sudo coverage xml
-        - helm lint helm/policy-api
-        - bash docker_quayio_push 
+        - |-
+          cd /home/travis/build/bcgov/OCWA/microservices/policyApi
+          helm lint helm/policy-api
+          bash docker_quayio_push ocwa_policy_api
         - |-
           cd /home/travis/build/bcgov/OCWA
           PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH
@@ -269,8 +274,10 @@ matrix:
           sudo pip3 install -e .
         - sudo coverage run --branch --source=db,v1,validator -m pytest
         - sudo coverage xml
-        - helm lint helm/validate-api
-        - bash docker_quayio_push
+        - |-
+          cd /home/travis/build/bcgov/OCWA/microservices/validateApi
+          helm lint helm/validate-api
+          bash docker_quayio_push ocwa_validate_api
         - |-
           cd /home/travis/build/bcgov/OCWA
           PATH=`pwd`/${SONAR_APP}-${SONAR_VERSION}/bin:$PATH
@@ -290,7 +297,7 @@ matrix:
       stage: "Frontend"
       language: node_js
       node_js:
-        - "node"
+        - "lts/*"
       cache: npm
       addons:
         apt:
@@ -323,8 +330,10 @@ matrix:
         - npm ci
         - npm audit
         - npm test
-        - helm lint helm/ocwa-frontend
-        - bash docker_quayio_push ocwa_frontend 
+        - |-
+          cd /home/travis/build/bcgov/OCWA/frontend
+          helm lint helm/ocwa-frontend
+          bash docker_quayio_push ocwa_frontend
         - |-
           cd /home/travis/build/bcgov/OCWA
           sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=sonar-project.properties -Dsonar.projectKey=ocwa_frontend -Dsonar.projectName="OCWA Frontend" -Dsonar.modules=frontend
@@ -372,6 +381,7 @@ matrix:
           cd /home/travis/build/bcgov/OCWA/terraform
           mkdir _tmp
           cp terraform.tfvars.example terraform.tfvars
+          python2 scripts/prepare_images_variable.py
         - terraform init
         - terraform apply -var hostRootPath=`pwd`/_tmp -auto-approve
 
@@ -392,6 +402,7 @@ matrix:
           sudo chmod +x Katalon_Studio/katalon
           sudo chmod -R 777 Katalon_Studio
         # Check that the install lifecycle worked
+        - docker images --digests
         - docker ps
 
       script:

diff --git a/frontend/docker_quayio_push b/frontend/docker_quayio_push
@@ -1,13 +1,19 @@
 #!/bin/bash
-
-#make sure in the right directory
-cd /home/travis/build/bcgov/OCWA/frontend
-
 QUAYIO_REPO=$1
+QUAYIO_BASE="quay.io/ikethecoder"
 
+echo "Logging into Quay..."
 echo "$QUAYIO_PASSWORD" | docker login -u "$QUAYIO_USERNAME" --password-stdin quay.io
-echo "logged in to quay, building now";
-docker build -t quay.io/ikethecoder/$QUAYIO_REPO .
-echo "dockerfile built pushing now";
-docker push quay.io/ikethecoder/$QUAYIO_REPO
-echo "push to quay done successfully";
+
+echo "Building Docker image..."
+docker build -t $QUAYIO_BASE/$QUAYIO_REPO .
+
+echo "Pushing image $QUAYIO_REPO to Quay..."
+docker push $QUAYIO_BASE/$QUAYIO_REPO
+if [ ! -z "$TRAVIS_BRANCH" ]; then
+    echo "Tagging image $QUAYIO_REPO with ${TRAVIS_BRANCH/\//-} on Quay..."
+    docker tag $QUAYIO_BASE/$QUAYIO_REPO $QUAYIO_BASE/$QUAYIO_REPO:${TRAVIS_BRANCH/\//-}
+    docker push $QUAYIO_BASE/$QUAYIO_REPO:${TRAVIS_BRANCH/\//-}
+fi
+
+echo "Docker image push completed"
diff --git a/microservices/forumApi/docker_quayio_push b/microservices/forumApi/docker_quayio_push
@@ -1,12 +1,19 @@
 #!/bin/bash
+QUAYIO_REPO=$1
+QUAYIO_BASE="quay.io/ikethecoder"
 
-#make sure in the right directory
-cd /home/travis/build/bcgov/OCWA/microservices/forumApi
+echo "Logging into Quay..."
+echo "$QUAYIO_PASSWORD" | docker login -u "$QUAYIO_USERNAME" --password-stdin quay.io
 
+echo "Building Docker image..."
+docker build -t $QUAYIO_BASE/$QUAYIO_REPO .
 
-echo "$QUAYIO_PASSWORD" | docker login -u "$QUAYIO_USERNAME" --password-stdin quay.io
-echo "logged in, building now";
-docker build -t quay.io/ikethecoder/ocwa_forum_api .
-echo "dockerfile built pushing now";
-docker push quay.io/ikethecoder/ocwa_forum_api
-echo "push done successfully";
+echo "Pushing image $QUAYIO_REPO to Quay..."
+docker push $QUAYIO_BASE/$QUAYIO_REPO
+if [ ! -z "$TRAVIS_BRANCH" ]; then
+    echo "Tagging image $QUAYIO_REPO with ${TRAVIS_BRANCH/\//-} on Quay..."
+    docker tag $QUAYIO_BASE/$QUAYIO_REPO $QUAYIO_BASE/$QUAYIO_REPO:${TRAVIS_BRANCH/\//-}
+    docker push $QUAYIO_BASE/$QUAYIO_REPO:${TRAVIS_BRANCH/\//-}
+fi
+
+echo "Docker image push completed"
diff --git a/microservices/policyApi/docker_quayio_push b/microservices/policyApi/docker_quayio_push
@@ -1,12 +1,19 @@
 #!/bin/bash
+QUAYIO_REPO=$1
+QUAYIO_BASE="quay.io/ikethecoder"
 
-#make sure in the right directory
-cd /home/travis/build/bcgov/OCWA/microservices/policyApi
+echo "Logging into Quay..."
+echo "$QUAYIO_PASSWORD" | docker login -u "$QUAYIO_USERNAME" --password-stdin quay.io
 
+echo "Building Docker image..."
+docker build -t $QUAYIO_BASE/$QUAYIO_REPO .
 
-echo "$QUAYIO_PASSWORD" | docker login -u "$QUAYIO_USERNAME" --password-stdin quay.io
-echo "logged in, building now";
-docker build -t quay.io/ikethecoder/ocwa_policy_api .
-echo "dockerfile built pushing now";
-docker push quay.io/ikethecoder/ocwa_policy_api
-echo "push done successfully";
+echo "Pushing image $QUAYIO_REPO to Quay..."
+docker push $QUAYIO_BASE/$QUAYIO_REPO
+if [ ! -z "$TRAVIS_BRANCH" ]; then
+    echo "Tagging image $QUAYIO_REPO with ${TRAVIS_BRANCH/\//-} on Quay..."
+    docker tag $QUAYIO_BASE/$QUAYIO_REPO $QUAYIO_BASE/$QUAYIO_REPO:${TRAVIS_BRANCH/\//-}
+    docker push $QUAYIO_BASE/$QUAYIO_REPO:${TRAVIS_BRANCH/\//-}
+fi
+
+echo "Docker image push completed"
diff --git a/microservices/requestApi/docker_quayio_push b/microservices/requestApi/docker_quayio_push
@@ -1,12 +1,19 @@
 #!/bin/bash
+QUAYIO_REPO=$1
+QUAYIO_BASE="quay.io/ikethecoder"
 
-#make sure in the right directory
-cd /home/travis/build/bcgov/OCWA/microservices/requestApi
+echo "Logging into Quay..."
+echo "$QUAYIO_PASSWORD" | docker login -u "$QUAYIO_USERNAME" --password-stdin quay.io
 
+echo "Building Docker image..."
+docker build -t $QUAYIO_BASE/$QUAYIO_REPO .
 
-echo "$QUAYIO_PASSWORD" | docker login -u "$QUAYIO_USERNAME" --password-stdin quay.io
-echo "logged in, building now";
-docker build -t quay.io/ikethecoder/ocwa_request_api .
-echo "dockerfile built pushing now";
-docker push quay.io/ikethecoder/ocwa_request_api
-echo "push done successfully";
+echo "Pushing image $QUAYIO_REPO to Quay..."
+docker push $QUAYIO_BASE/$QUAYIO_REPO
+if [ ! -z "$TRAVIS_BRANCH" ]; then
+    echo "Tagging image $QUAYIO_REPO with ${TRAVIS_BRANCH/\//-} on Quay..."
+    docker tag $QUAYIO_BASE/$QUAYIO_REPO $QUAYIO_BASE/$QUAYIO_REPO:${TRAVIS_BRANCH/\//-}
+    docker push $QUAYIO_BASE/$QUAYIO_REPO:${TRAVIS_BRANCH/\//-}
+fi
+
+echo "Docker image push completed"
diff --git a/microservices/validateApi/docker_quayio_push b/microservices/validateApi/docker_quayio_push
@@ -1,12 +1,19 @@
 #!/bin/bash
+QUAYIO_REPO=$1
+QUAYIO_BASE="quay.io/ikethecoder"
 
-#make sure in the right directory
-cd /home/travis/build/bcgov/OCWA/microservices/validateApi
+echo "Logging into Quay..."
+echo "$QUAYIO_PASSWORD" | docker login -u "$QUAYIO_USERNAME" --password-stdin quay.io
 
+echo "Building Docker image..."
+docker build -t $QUAYIO_BASE/$QUAYIO_REPO .
 
-echo "$QUAYIO_PASSWORD" | docker login -u "$QUAYIO_USERNAME" --password-stdin quay.io
-echo "logged in, building now";
-docker build -t quay.io/ikethecoder/ocwa_validate_api .
-echo "dockerfile built pushing now";
-docker push quay.io/ikethecoder/ocwa_validate_api
-echo "push done successfully";
+echo "Pushing image $QUAYIO_REPO to Quay..."
+docker push $QUAYIO_BASE/$QUAYIO_REPO
+if [ ! -z "$TRAVIS_BRANCH" ]; then
+    echo "Tagging image $QUAYIO_REPO with ${TRAVIS_BRANCH/\//-} on Quay..."
+    docker tag $QUAYIO_BASE/$QUAYIO_REPO $QUAYIO_BASE/$QUAYIO_REPO:${TRAVIS_BRANCH/\//-}
+    docker push $QUAYIO_BASE/$QUAYIO_REPO:${TRAVIS_BRANCH/\//-}
+fi
+
+echo "Docker image push completed"
diff --git a/terraform/ocwa_forum_api.tf b/terraform/ocwa_forum_api.tf
@@ -1,6 +1,6 @@
 
 data "docker_registry_image" "ocwa_forum_api" {
-  name = "bcgovimages/ocwa_forum_api${var.images["forum_api"]}"
+  name = "${var.images["owner"]}/ocwa_forum_api${var.images["forum_api"]}"
 }
 
 resource "docker_image" "ocwa_forum_api" {

diff --git a/terraform/ocwa_frontend.tf b/terraform/ocwa_frontend.tf
@@ -1,6 +1,6 @@
 
 data "docker_registry_image" "ocwa_frontend" {
-  name = "bcgovimages/ocwa_frontend${var.images["frontend"]}"
+  name = "${var.images["owner"]}/ocwa_frontend${var.images["frontend"]}"
 }
 
 resource "docker_image" "ocwa_frontend" {

diff --git a/terraform/ocwa_policy_api.tf b/terraform/ocwa_policy_api.tf
@@ -1,6 +1,6 @@
 
 data "docker_registry_image" "ocwa_policy_api" {
-  name = "bcgovimages/ocwa_policy_api${var.images["policy_api"]}"
+  name = "${var.images["owner"]}/ocwa_policy_api${var.images["policy_api"]}"
 }
 
 resource "docker_image" "ocwa_policy_api" {

diff --git a/terraform/ocwa_request_api.tf b/terraform/ocwa_request_api.tf
@@ -1,6 +1,6 @@
 
 data "docker_registry_image" "ocwa_request_api" {
-  name = "bcgovimages/ocwa_request_api${var.images["request_api"]}"
+  name = "${var.images["owner"]}/ocwa_request_api${var.images["request_api"]}"
 }
 
 resource "docker_image" "ocwa_request_api" {

diff --git a/terraform/ocwa_validate_api.tf b/terraform/ocwa_validate_api.tf
@@ -1,6 +1,6 @@
 
 data "docker_registry_image" "ocwa_validate_api" {
-  name = "bcgovimages/ocwa_validate_api${var.images["validate_api"]}"
+  name = "${var.images["owner"]}/ocwa_validate_api${var.images["validate_api"]}"
 }
 
 resource "docker_image" "ocwa_validate_api" {

diff --git a/terraform/report.tf b/terraform/report.tf
@@ -18,11 +18,12 @@ resource "local_file" "report_script" {
 data "template_file" "terraform_lock" {
   template = "${file("${path.module}/scripts/terraform.lock.tpl")}"
   vars = {
-    requestApiDigest = "${data.docker_registry_image.ocwa_request_api.sha256_digest}"      
-    policyApiDigest = "${data.docker_registry_image.ocwa_policy_api.sha256_digest}"      
-    validateApiDigest = "${data.docker_registry_image.ocwa_validate_api.sha256_digest}"      
-    forumApiDigest = "${data.docker_registry_image.ocwa_forum_api.sha256_digest}"      
-    frontendDigest = "${data.docker_registry_image.ocwa_frontend.sha256_digest}"      
+    owner = "${var.images["owner"]}"      
+    requestApiDigest = "@${data.docker_registry_image.ocwa_request_api.sha256_digest}"      
+    policyApiDigest = "@${data.docker_registry_image.ocwa_policy_api.sha256_digest}"      
+    validateApiDigest = "@${data.docker_registry_image.ocwa_validate_api.sha256_digest}"      
+    forumApiDigest = "@${data.docker_registry_image.ocwa_forum_api.sha256_digest}"      
+    frontendDigest = "@${data.docker_registry_image.ocwa_frontend.sha256_digest}"      
   }
 }
 

diff --git a/terraform/scripts/prepare_images_variable.py b/terraform/scripts/prepare_images_variable.py
@@ -0,0 +1,21 @@
+import os
+from string import Template
+
+template = """ 
+
+images = {
+    owner = "quay.io/ikethecoder"
+    request_api = ":${TAG}"
+    policy_api = ":${TAG}"
+    validate_api = ":${TAG}"
+    forum_api = ":${TAG}"
+    frontend = ":${TAG}"
+    minio = ":latest"
+    tusd = ":latest"
+}
+    """
+
+s = Template(template)
+
+with open('terraform.auto.tfvars', 'w') as the_file:
+    the_file.write(s.substitute(TAG=os.environ['TRAVIS_BRANCH'].replace('/', '-')))
diff --git a/terraform/scripts/terraform.lock.tpl b/terraform/scripts/terraform.lock.tpl
@@ -1,5 +1,6 @@
 
 images = {
+    owner = "${owner}"
     request_api = "${requestApiDigest}"
     policy_api = "${policyApiDigest}"}
     validate_api = "${validateApiDigest}"}

diff --git a/terraform/terraform.tfvars.example b/terraform/terraform.tfvars.example
@@ -26,6 +26,7 @@ sslCertificate = "/ssl/example.crt"
 sslCertificateKey = "/ssl/example.key"
 
 images = {
+    owner = "bcgovimages"
     request_api = ":edge"
     validate_api = ":edge"
     forum_api = ":edge"