From 6140b0efd7f9d748c1667506ab3df2c5c12e9093 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Tue, 23 Jan 2024 15:06:08 +0100
Subject: [PATCH] chore(chalice): image name as variable

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 api/build.sh | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/api/build.sh b/api/build.sh
index b753110774..10c0df47e7 100644
--- a/api/build.sh
+++ b/api/build.sh
@@ -9,10 +9,10 @@
 
 # Helper function
 exit_err() {
-  err_code=$1
-  if [[ $err_code != 0 ]]; then
-    exit $err_code
-  fi
+    err_code=$1
+    if [[ $err_code != 0 ]]; then
+        exit $err_code
+    fi
 }
 
 environment=$1
@@ -30,31 +30,31 @@ check_prereq() {
 
 [[ $1 == ee ]] && ee=true
 [[ $PATCH -eq 1 ]] && {
-  image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}'  | awk -F. -v OFS=. '{$NF += 1 ; print}')"
-  [[ $ee == "true" ]] && {
-    image_tag="${image_tag}-ee"
-  }
+    image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}' | awk -F. -v OFS=. '{$NF += 1 ; print}')"
+    [[ $ee == "true" ]] && {
+        image_tag="${image_tag}-ee"
+    }
 }
 update_helm_release() {
-  [[ $ee == "true" ]] && return
-  HELM_TAG="$(grep -iER ^version ../scripts/helmcharts/openreplay/charts/$chart | awk '{print $2}'  | awk -F. -v OFS=. '{$NF += 1 ; print}')"
-  # Update the chart version
-  sed -i "s#^version.*#version: $HELM_TAG# g" ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml
-  # Update image tags
-  sed -i "s#ppVersion.*#ppVersion: \"$image_tag\"#g" ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml
-  # Commit the changes
-  git add ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml
-  git commit -m "chore(helm): Updating $chart image release"
+    [[ $ee == "true" ]] && return
+    HELM_TAG="$(grep -iER ^version ../scripts/helmcharts/openreplay/charts/$chart | awk '{print $2}' | awk -F. -v OFS=. '{$NF += 1 ; print}')"
+    # Update the chart version
+    sed -i "s#^version.*#version: $HELM_TAG# g" ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml
+    # Update image tags
+    sed -i "s#ppVersion.*#ppVersion: \"$image_tag\"#g" ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml
+    # Commit the changes
+    git add ../scripts/helmcharts/openreplay/charts/$chart/Chart.yaml
+    git commit -m "chore(helm): Updating $chart image release"
 }
 
-function build_api(){
+function build_api() {
     destination="_api"
     [[ $1 == "ee" ]] && {
         destination="_api_ee"
     }
     [[ -d ../${destination} ]] && {
-      echo "Removing previous build cache"
-      rm -rf ../${destination}
+        echo "Removing previous build cache"
+        rm -rf ../${destination}
     }
     cp -R ../api ../${destination}
     cd ../${destination} || exit_err 100
@@ -66,16 +66,16 @@ function build_api(){
         tag="ee-"
     }
     mv Dockerfile.dockerignore .dockerignore
-    docker build -f ./Dockerfile --build-arg envarg=$envarg --build-arg GIT_SHA=$git_sha -t ${DOCKER_REPO:-'local'}/chalice:${image_tag} .
+    docker build -f ./Dockerfile --build-arg envarg=$envarg --build-arg GIT_SHA=$git_sha -t ${DOCKER_REPO:-'local'}/${IMAGE_NAME:-'chalice'}:${image_tag} .
     cd ../api || exit_err 100
     rm -rf ../${destination}
     [[ $PUSH_IMAGE -eq 1 ]] && {
-        docker push ${DOCKER_REPO:-'local'}/chalice:${image_tag}
-        docker tag ${DOCKER_REPO:-'local'}/chalice:${image_tag} ${DOCKER_REPO:-'local'}/chalice:${tag}latest
-        docker push ${DOCKER_REPO:-'local'}/chalice:${tag}latest
+        docker push ${DOCKER_REPO:-'local'}/${IMAGE_NAME:-'chalice'}:${image_tag}
+        docker tag ${DOCKER_REPO:-'local'}/${IMAGE_NAME:-'chalice'}:${image_tag} ${DOCKER_REPO:-'local'}/chalice:${tag}latest
+        docker push ${DOCKER_REPO:-'local'}/${IMAGE_NAME:-'chalice'}:${tag}latest
     }
     [[ $SIGN_IMAGE -eq 1 ]] && {
-        cosign sign --key $SIGN_KEY ${DOCKER_REPO:-'local'}/chalice:${image_tag}
+        cosign sign --key $SIGN_KEY ${DOCKER_REPO:-'local'}/${IMAGE_NAME:-'chalice'}:${image_tag}
     }
     echo "api docker build completed"
 }
@@ -84,5 +84,5 @@ check_prereq
 build_api $environment
 echo buil_complete
 if [[ $PATCH -eq 1 ]]; then
-  update_helm_release
+    update_helm_release
 fi