From 0394ae989eb87d267587ff83e3dba0081d983910 Mon Sep 17 00:00:00 2001
From: Khoa Vo <vndangkhoa@khoavo.myds.me>
Date: Mon, 27 Apr 2026 18:00:06 +0700
Subject: [PATCH] ci: Improve workflow with better checkout and timeout

---
 .forgejo/workflows/docker.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.forgejo/workflows/docker.yml b/.forgejo/workflows/docker.yml
index 6c5bd98..2d77c97 100644
--- a/.forgejo/workflows/docker.yml
+++ b/.forgejo/workflows/docker.yml
@@ -12,16 +12,19 @@ env:
 jobs:
     build-and-push:
         runs-on: synology-runner
+        timeout-minutes: 30
 
         steps:
             - name: Checkout code
               run: |
-                  git clone https://git.khoavo.myds.me/vndangkhoa/monochrome.git /workspace/monochrome
-                  cd /workspace/monochrome
-                  git checkout $GITHUB_SHA
+                  if [ -d "/workspace/monochrome" ]; then
+                    rm -rf /workspace/monochrome
+                  fi
+                  git clone --depth 1 https://git.khoavo.myds.me/vndangkhoa/monochrome.git /workspace/monochrome
 
             - name: Set up Docker Buildx
-              run: docker buildx create --name mybuilder --use || docker buildx use mybuilder
+              run: |
+                  docker buildx create --name mybuilder --use 2>/dev/null || docker buildx use mybuilder
 
             - name: Login to Forgejo Container Registry
               run: |
@@ -30,8 +33,6 @@ jobs:
             - name: Build and push Docker image
               run: |
                   cd /workspace/monochrome
-                  TAG="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:$(echo $GITHUB_SHA | cut -c1-8)"
-                  if [ "$GITHUB_REF" = "refs/heads/main" ]; then
-                    TAG="$TAG ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}:latest"
-                  fi
-                  docker buildx build --platform linux/amd64 -t $TAG -f docker/Dockerfile --push .
+                  COMMIT_SHA=$(git rev-parse HEAD)
+                  TAG="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${COMMIT_SHA:0:8}"
+                  docker buildx build --platform linux/amd64 -t $TAG -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}:latest -f docker/Dockerfile --push .