From d724be54bff95c223a2d251c891a78fc62ac10a6 Mon Sep 17 00:00:00 2001
From: Stefan Bethke <stb@lassitu.de>
Date: Sun, 15 Nov 2026 11:57:20 +0100
Subject: [PATCH] chore: Reverts workflow changes

The image build workflow is handled separately in the kaniko-build branch;
this pull request no longer changes it.
---
 .forgejo/workflows/images.yml | 62 +++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml
index cb999c5..0306fee 100644
--- a/.forgejo/workflows/images.yml
+++ b/.forgejo/workflows/images.yml
@@ -6,48 +6,52 @@ on:
 
 jobs:
   build:
-    runs-on: docker
-    container:
-      image: ghcr.io/osscontainertools/kaniko:alpine
+    runs-on: windows-2022
     steps:
-      - name: Install required system packages
-        run: apk add --no-cache nodejs git
-
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Login to Container Registry
+        uses: docker/login-action@v4
+        with:
+          registry: git.hamburg.ccc.de
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
       
       - name: Set image tags
         id: vars
         run: |
-          if [ "${{ forgejo.ref_name }}" = "main" ] && [ "${{ forgejo.event_name }}" = "push" ]; then
+          if [ "${{ github.ref_name }}" = "main" ] && [ "${{ github.event_name }}" = "push" ]; then
             echo "tag=latest" >> $GITHUB_OUTPUT
           else
             # renovate creates sub branches with `/`; these break the tagging in the build process
-            echo tag=$(echo "${{ forgejo.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/_/g') >> $GITHUB_OUTPUT
+            echo tag=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/_/g') >> $GITHUB_OUTPUT
           fi
 
       - name: Build web image
-        env:
-          KANIKO_NO_PUSH: ${{ forgejo.event_name != 'push' }}
-          KANIKO_GIT_HAMBURG_CCC_DE_USER: ${{ secrets.REGISTRY_USERNAME }}
-          KANIKO_GIT_HAMBURG_CCC_DE_PASSWORD: ${{ secrets.REGISTRY_TOKEN }}
         run: |
-          /kaniko/executor \
-            --dockerfile="${{ forgejo.workspace }}/web/Containerfile" \
-            --context="dir://${{ forgejo.workspace }}/web" \
-            --destination=git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} \
-            --no-push-cache \
-            --credential-helpers=env
+          docker buildx build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} --load .
+        working-directory: ./web
 
       - name: Build data_handler image
-        env:
-          KANIKO_NO_PUSH: ${{ forgejo.event_name != 'push' }}
-          KANIKO_GIT_HAMBURG_CCC_DE_USER: ${{ secrets.REGISTRY_USERNAME }}
-          KANIKO_GIT_HAMBURG_CCC_DE_PASSWORD: ${{ secrets.REGISTRY_TOKEN }}
         run: |
-          /kaniko/executor \
-            --dockerfile="${{ forgejo.workspace }}/data_handler/Containerfile" \
-            --context="dir://${{ forgejo.workspace }}/data_handler" \
-            --destination=git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }} \
-            --no-push-cache \
-            --credential-helpers=env
\ No newline at end of file
+          docker buildx build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }} --load .
+        working-directory: ./data_handler
+
+      - name: Push images to Container Registry
+        run: |
+          docker push git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }}
+          docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }}
+        if: github.event_name == 'push'
+
+      - name: Update docker-compose.yml image tags
+        run: |
+          sed -i "s/:latest/:${{ steps.vars.outputs.tag }}/g" docker-compose.yml
+
+      - name: Start Docker Compose services
+        run: |
+          docker compose up -d --wait
+          docker compose down 
\ No newline at end of file