Merge pull request #2758 from binary-com/beta

beta to master (v20200506_0)

Author: Aaron

.circleci/config.yml

@@ -94,17 +94,14 @@ commands:
       - run:
           name: Building docker image for << parameters.target >>
           command: |
-            build_tag="${CIRCLE_SHA1}"
-            [ "<< parameters.target >>" == "beta" ] && build_tag="beta-${CIRCLE_SHA1}"
-            docker build -t ${DOCKHUB_ORGANISATION}/binary-static-bot:${build_tag} -t ${DOCKHUB_ORGANISATION}/binary-static-bot:latest .
+            build_latest="latest"
+            [ "<< parameters.target >>" == "beta" ]  && build_latest="beta-latest"
+            docker build -t ${DOCKHUB_ORGANISATION}/binary-static-bot:${CIRCLE_TAG} -t ${DOCKHUB_ORGANISATION}/binary-static-bot:${build_latest} .
       - run:
           name: Pushing Image to docker hub
           command: |
-            build_tag="${CIRCLE_SHA1}"
-            [ "<< parameters.target >>" == "beta" ] && build_tag="beta-${CIRCLE_SHA1}"
             echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin
-            docker push ${DOCKHUB_ORGANISATION}/binary-static-bot:${build_tag}
-            docker push ${DOCKHUB_ORGANISATION}/binary-static-bot:latest
+            docker push ${DOCKHUB_ORGANISATION}/binary-static-bot
   k8s_deploy:
     description: "Deploy to k8s cluster"
     parameters:
@@ -126,11 +123,10 @@ commands:
                 CA_CRT="${!CA_CRT_REF}"
                 KUBE_SERVER="${!KUBE_SERVER_REF}"
                 SERVICEACCOUNT_TOKEN="${!SERVICEACCOUNT_TOKEN_REF}"
-                build_tag="${CIRCLE_SHA1}"
                 deployment_target="bot-binary-com"
-                [ "<< parameters.target >>" == "beta" ] && build_tag="beta-${CIRCLE_SHA1}" && deployment_target="bot-beta-binary-com"
+                [ "<< parameters.target >>" == "beta" ] && deployment_target="bot-beta-binary-com"
                 echo $CA_CRT | base64 --decode > ca.crt
-                kubectl --server=${KUBE_SERVER} --certificate-authority=ca.crt --token=$SERVICEACCOUNT_TOKEN set image deployment/${deployment_target} ${deployment_target}=${DOCKHUB_ORGANISATION}/binary-static-bot:${build_tag}
+                kubectl --server=${KUBE_SERVER} --certificate-authority=ca.crt --token=$SERVICEACCOUNT_TOKEN set image deployment/${deployment_target} ${deployment_target}=${DOCKHUB_ORGANISATION}/binary-static-bot:${CIRCLE_TAG}
               fi
             done