From 15041eca5f3b95247e2fbfdfab385f8b2fa47503 Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Sun, 11 Jan 2026 14:41:09 +0000
Subject: [PATCH] docker: Improve git tag/ commit hash integration

---
 .ci/docker.sh               | 19 ++++++++++++++++---
 .github/workflows/build.yml |  4 ++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.ci/docker.sh b/.ci/docker.sh
index 75c4fe024..d4df835c4 100755
--- a/.ci/docker.sh
+++ b/.ci/docker.sh
@@ -1,4 +1,17 @@
-mkdir build
+#!/bin/bash -ex
 
-docker build -f docker/azahar-room/Dockerfile -t azahar-room .
-docker save azahar-room:latest > build/azahar-room.dockerimage
\ No newline at end of file
+GITREV="`git show -s --format='%h'`" || true
+
+if [ "$GITHUB_REF_TYPE" = "tag" ]; then
+    TAG_NAME=$GITHUB_REF_NAME
+elif [[ -n $GITREV ]]; then
+    TAG_NAME=$GITREV
+else
+    TAG_NAME=unknown
+fi
+
+echo "Tag name is: $TAG_NAME"
+
+docker build -f docker/azahar-room/Dockerfile -t azahar-room:$TAG_NAME .
+mkdir -p build
+docker save azahar-room:$TAG_NAME > build/azahar-room-$TAG_NAME.dockerimage
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 10b8ace96..7963badca 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -292,6 +292,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+      - name: Install tools
+        run: apk add bash
+      - name: Fix git ownership
+        run: git config --global --add safe.directory .
       - name: Build Docker image
         run: ./.ci/docker.sh
       - name: Move Docker image to artifacts directory