From 02546504438b3cdc901c0dc0595d276f9fdc7459 Mon Sep 17 00:00:00 2001
From: Chethan <chethan.rao@juspay.in>
Date: Tue, 21 Nov 2023 13:33:08 +0530
Subject: [PATCH] test commit

---
 .../workflows/build-and-push-docker-image.yml    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-push-docker-image.yml b/.github/workflows/build-and-push-docker-image.yml
index 55cce46..a932422 100644
--- a/.github/workflows/build-and-push-docker-image.yml
+++ b/.github/workflows/build-and-push-docker-image.yml
@@ -21,7 +21,21 @@ jobs:
       - name: Docker tag creation with trigger event being 'push'
         if: ${{ github.event_name == 'push' }}
         shell: bash
-        run: echo "DOCKER_TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV
+        run: |
+          echo "DOCKER_TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV
+          if [[ ${{ github.ref_type }} == 'tag' ]]; then
+             DOCKER_TAG=$GITHUB_REF_NAME
+           else
+             git fetch origin $GITHUB_REF_NAME
+             DOCKER_TAG=$(git rev-parse --short=7 "$GITHUB_REF_NAME^{commit}")
+           fi
+           echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
+           echo "docker_tag: $DOCKER_TAG"
+           echo "tag2: ${{ env.DOCKER_TAG }}"
+
+      - shell: bash
+        run: |
+          echo "tag2: ${{ env.DOCKER_TAG }}"
 
       - name: Docker tag creation with trigger event being 'workflow_dispatch'
         if: ${{ github.event_name == 'workflow_dispatch' }}