From 4042ad940647ae3a818170e114b878e7cb877eef Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Wed, 28 Dec 2022 12:44:48 +0100
Subject: [PATCH] build(docker): Adding gitsha as env

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 backend/Dockerfile | 4 ++++
 backend/build.sh   | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index ae6a5db18..043de51cd 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -19,10 +19,14 @@ RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o service -tags dynamic open
 
 
 FROM alpine AS entrypoint
+ARG GIT_SHA
+LABEL GIT_SHA=$GIT_SHA
+
 RUN apk add --no-cache ca-certificates librdkafka-dev cyrus-sasl cyrus-sasl-gssapiv2 krb5
 RUN adduser -u 1001 openreplay -D
 
 ENV TZ=UTC \
+    GIT_SHA=$GIT_SHA \
     FS_ULIMIT=1000 \
     FS_DIR=/mnt/efs \
     MAXMINDDB_FILE=/home/openreplay/geoip.mmdb \
diff --git a/backend/build.sh b/backend/build.sh
index 073f540df..6ff4cd4ef 100755
--- a/backend/build.sh
+++ b/backend/build.sh
@@ -9,7 +9,8 @@
 # Usage: IMAGE_TAG=latest DOCKER_REPO=myDockerHubID bash build.sh <ee>
 set -e
 
-git_sha1=${IMAGE_TAG:-$(git rev-parse HEAD)}
+git_sha=$(git rev-parse --short HEAD)
+image_tag=${IMAGE_TAG:-git_sha}
 ee="false"
 check_prereq() {
     which docker || {
@@ -22,9 +23,9 @@ check_prereq() {
 function build_service() {
     image="$1"
     echo "BUILDING $image"
-    docker build -t ${DOCKER_REPO:-'local'}/$image:${git_sha1} --platform linux/amd64 --build-arg SERVICE_NAME=$image .
+    docker build -t ${DOCKER_REPO:-'local'}/$image:${image_tag} --platform linux/amd64 --build-arg SERVICE_NAME=$image --build-arg GIT_SHA=$git_sha .
     [[ $PUSH_IMAGE -eq 1 ]] && {
-        docker push ${DOCKER_REPO:-'local'}/$image:${git_sha1}
+        docker push ${DOCKER_REPO:-'local'}/$image:${image_tag}
     }
     echo "Build completed for $image"
     return
@@ -51,7 +52,7 @@ function build_api(){
     for image in $(ls cmd);
     do
         build_service $image
-        echo "::set-output name=image::${DOCKER_REPO:-'local'}/$image:${git_sha1}"
+        echo "::set-output name=image::${DOCKER_REPO:-'local'}/$image:${image_tag}"
     done
     cd ../backend
     rm -rf ../${destination}