From 427ae445e5bb768c29c0323c0355c7dbd8bc7a52 Mon Sep 17 00:00:00 2001
From: Arsham Teymouri <arsham@parity.io>
Date: Tue, 24 Aug 2021 11:38:50 +0300
Subject: [PATCH 1/3] gitlab-ci: changing docker repositories

---
 .gitlab-ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1ee6c9..fede820 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
   CONTAINER_REGISTRY:             "docker.io/parity"
-  BACKEND_CONTAINER_REPO:         "substrate-telemetry-backend"
-  FRONTEND_CONTAINER_REPO:        "substrate-telemetry-frontend"
+  BACKEND_CONTAINER_REPO:         "substrate-telemetry-backend-stg"
+  FRONTEND_CONTAINER_REPO:        "substrate-telemetry-frontend-stg"
   KUBE_NAMESPACE:                 "substrate-telemetry"
   BACKEND_IMAGE_FULL_NAME:        "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}"
   BACKEND_IMAGE_LATEST_TAG:       "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:latest"
@@ -32,6 +32,7 @@ stages:
       echo "Using Helm `helm version --short`"
       helm repo add parity https://paritytech.github.io/helm-charts/
       helm repo update
+      curl -sS $HELM_VALUES_FILE > values-parity.yaml
     - helm upgrade
         --install
         --atomic
@@ -42,7 +43,7 @@ stages:
         --set image.backend.tag="${CI_COMMIT_SHORT_SHA}"
         --set image.frontend.repository="${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}"
         --set image.frontend.tag="${CI_COMMIT_SHORT_SHA}"
-        --values $HELM_VALUES_FILE
+        --values values-parity.yaml
         $KUBE_NAMESPACE parity/substrate-telemetry
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'

From bcd9f32b1826c2aa77db43d2c6a60e7e17cb26c8 Mon Sep 17 00:00:00 2001
From: Arsham Teymouri <arsham@parity.io>
Date: Wed, 25 Aug 2021 13:11:33 +0300
Subject: [PATCH 2/3] removing the latest tag

---
 .gitlab-ci.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fede820..017ad14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,10 @@
 variables:
   CONTAINER_REGISTRY:             "docker.io/parity"
-  BACKEND_CONTAINER_REPO:         "substrate-telemetry-backend-stg"
-  FRONTEND_CONTAINER_REPO:        "substrate-telemetry-frontend-stg"
+  BACKEND_CONTAINER_REPO:         "substrate-telemetry-backend"
+  FRONTEND_CONTAINER_REPO:        "substrate-telemetry-frontend"
   KUBE_NAMESPACE:                 "substrate-telemetry"
   BACKEND_IMAGE_FULL_NAME:        "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}"
-  BACKEND_IMAGE_LATEST_TAG:       "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:latest"
   FRONTEND_IMAGE_FULL_NAME:       "${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}"
-  FRONTEND_IMAGE_LATEST_TAG:      "${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}:latest"
 
 stages:
   - dockerize
@@ -57,13 +55,11 @@ dockerize-backend:
     - echo "Building image $BACKEND_IMAGE_FULL_NAME"
     - buildah bud
       --format=docker
-      --tag "$BACKEND_IMAGE_FULL_NAME"
-      --tag "$BACKEND_IMAGE_LATEST_TAG" ./backend/
+      --tag "$BACKEND_IMAGE_FULL_NAME" ./backend/
     - echo ${Docker_Hub_Pass_Parity} |
         buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io
     - |-
       buildah push --format=v2s2 "$BACKEND_IMAGE_FULL_NAME"
-      buildah push --format=v2s2 "$BACKEND_IMAGE_LATEST_TAG"
 
 dockerize-frontend:
   <<:                     *dockerize
@@ -71,13 +67,11 @@ dockerize-frontend:
     - echo "Building image $FRONTEND_IMAGE_FULL_NAME"
     - buildah bud
       --format=docker
-      --tag "$FRONTEND_IMAGE_FULL_NAME"
-      --tag "$FRONTEND_IMAGE_LATEST_TAG" ./frontend/
+      --tag "$FRONTEND_IMAGE_FULL_NAME" ./frontend/
     - echo ${Docker_Hub_Pass_Parity} |
         buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io
     - |-
       buildah push --format=v2s2 "$FRONTEND_IMAGE_FULL_NAME"
-      buildah push --format=v2s2 "$FRONTEND_IMAGE_LATEST_TAG"
 
 deploy-parity-stg:
   stage:                  staging

From 4fe1aabea2a30ac5a657f70580beadaaa9c013a4 Mon Sep 17 00:00:00 2001
From: Arsham Teymouri <arsham@parity.io>
Date: Wed, 25 Aug 2021 13:20:40 +0300
Subject: [PATCH 3/3] added beta postfix to docker tags

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 017ad14..f183c60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,8 @@ variables:
   BACKEND_CONTAINER_REPO:         "substrate-telemetry-backend"
   FRONTEND_CONTAINER_REPO:        "substrate-telemetry-frontend"
   KUBE_NAMESPACE:                 "substrate-telemetry"
-  BACKEND_IMAGE_FULL_NAME:        "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}"
-  FRONTEND_IMAGE_FULL_NAME:       "${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}"
+  BACKEND_IMAGE_FULL_NAME:        "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}-beta"
+  FRONTEND_IMAGE_FULL_NAME:       "${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}-beta"
 
 stages:
   - dockerize