From a6e5815aea0afa7e51c401511e9d13f7a6179f1e Mon Sep 17 00:00:00 2001
From: Lukas Greve <lukas@noreply.git.phyllo.me>
Date: Wed, 12 Nov 2025 20:35:36 +0000
Subject: [PATCH] Update .gitea/workflows/dockerbuild.yml

Docker-in-Docker (DinD) and make the workflow cleaner
---
 .gitea/workflows/dockerbuild.yml | 46 ++++++++++++--------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/.gitea/workflows/dockerbuild.yml b/.gitea/workflows/dockerbuild.yml
index 5f9cf30..4d9151f 100644
--- a/.gitea/workflows/dockerbuild.yml
+++ b/.gitea/workflows/dockerbuild.yml
@@ -1,42 +1,30 @@
 name: Build and Push Docker Image
-
 on:
   push:
     branches: [ main ]
-
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v4
-
+      - uses: actions/checkout@v5
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        
       - name: Login to Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: git.phyllo.me
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Build Docker Image
-        env:
-          BRANCH_NAME: ${{ github.ref_name }}
-          SHORT_HASH: ${{ github.sha }}
-        run: |
-          # Build the image with the commit hash tag
-          docker build --build-arg BUILD_IDENTIFIER=${SHORT_HASH:0:5} -t https://git.phyllo.me/devops/fedora-runner-image:${BRANCH_NAME}-${SHORT_HASH:0:5} .
-
-          # Tag the same image as "latest"
-          docker tag https://git.phyllo.me/devops/fedora-runner-image:${BRANCH_NAME}-${SHORT_HASH:0:5} https://git.phyllo.me/devops/fedora-runner-image:${BRANCH_NAME}-latest
-
-      - name: Push Docker Images
-        env:
-          BRANCH_NAME: ${{ github.ref_name }}
-          SHORT_HASH: ${{ github.sha }}
-        run: |
-          docker push https://git.phyllo.me/devops/fedora-runner-image:${BRANCH_NAME}-${SHORT_HASH:0:5}
-          docker push https://git.phyllo.me/devops/fedora-runner-image:${BRANCH_NAME}-latest
-
-      - name: Log out from registry
-        if: always()
-        run: docker logout git.phyllo.me
+      
+      - name: Build and Push Docker Image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: |
+            git.phyllo.me/devops/fedora-runner-image:${{ github.ref_name }}-${{ github.sha }}
+            git.phyllo.me/devops/fedora-runner-image:${{ github.ref_name }}-latest
+          build-args: |
+            BUILD_IDENTIFIER=${{ github.sha }}
\ No newline at end of file