From 449b515cb510c2d4651e2148a8c12a17365c685e Mon Sep 17 00:00:00 2001
From: Merith <merith@merith.xyz>
Date: Fri, 9 May 2025 13:16:05 -0700
Subject: [PATCH] release tag building

---
 .forgejo/workflows/build-on-commit.yml |  3 ---
 .forgejo/workflows/build-on-tag.yml    | 29 +++++++++++++++++---------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.forgejo/workflows/build-on-commit.yml b/.forgejo/workflows/build-on-commit.yml
index 5bfc7a3..fba6d8f 100644
--- a/.forgejo/workflows/build-on-commit.yml
+++ b/.forgejo/workflows/build-on-commit.yml
@@ -28,9 +28,6 @@ jobs:
           driver-opts: |
             network=host
 
-      - name: Verify Docker connection
-        run: docker info
-
       - name: Login to OCI registry
         run: |
           echo "${{ secrets.OCI_TOKEN }}" | docker login $REPO_HOST -u "${{ secrets.OCI_USER }}" --password-stdin
diff --git a/.forgejo/workflows/build-on-tag.yml b/.forgejo/workflows/build-on-tag.yml
index 888102b..012b946 100644
--- a/.forgejo/workflows/build-on-tag.yml
+++ b/.forgejo/workflows/build-on-tag.yml
@@ -18,20 +18,29 @@ jobs:
         run: |
           echo "REPO_HOST=$(echo "${{ github.server_url }}" | sed 's~http[s]*://~~g')" >> $GITHUB_ENV
           echo "REPO_PATH=${{ github.repository }}" >> $GITHUB_ENV
+          echo "TAG=${{ github.ref_name }}" >> $GITHUB_ENV
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
+          driver-opts: |
+            network=host
 
       - name: Login to OCI registry
         run: |
           echo "${{ secrets.OCI_TOKEN }}" | docker login $REPO_HOST -u "${{ secrets.OCI_USER }}" --password-stdin
 
-      - name: Build and push Docker image
+      - name: Build and push Docker images
         run: |
-          TAG=${{ github.ref_name }} # Get the tag name from the context
-          # Build and push multi-platform Docker images
-          docker build -t $REPO_HOST/$REPO_PATH:$TAG --push .
-          # Tag and push latest
-          docker tag $REPO_HOST/$REPO_PATH:$TAG $REPO_HOST/$REPO_PATH:latest
-          docker push $REPO_HOST/$REPO_PATH:latest
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --tag $REPO_HOST/$REPO_PATH:$TAG \
+            --tag $REPO_HOST/$REPO_PATH:latest \
+            --push \
+            .
 
-          # Remove the local image to save storage
-          docker rmi $REPO_HOST/$REPO_PATH:$TAG
-          docker rmi $REPO_HOST/$REPO_PATH:latest
\ No newline at end of file
+      - name: Cleanup
+        run: |
+          docker buildx prune -f
+          docker logout $REPO_HOST
\ No newline at end of file