From c3e50cae4d855ae7eceddc76698817c889fd3bd5 Mon Sep 17 00:00:00 2001
From: Jonathan Cremin <jonathan@crem.in>
Date: Sun, 15 Jun 2025 19:03:03 +0100
Subject: [PATCH] Use Docker instead of Podman for now

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

diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
index a76d0c2..d521b2e 100644
--- a/.forgejo/workflows/ci.yml
+++ b/.forgejo/workflows/ci.yml
@@ -14,32 +14,23 @@ jobs:
         run: echo "NOW=$(date +'%Y%m%d-%H%M%S')" >> $GITHUB_ENV
       - name: Fix for bad os check
         run: echo "RUNNER_OS=Linux" >> $GITHUB_ENV
-      - name: Login to Forgejo Registry
-        uses: https://cremin.dev/actions/podman-login@v1
+      - name: Login to Docker Hub
+        uses: https://cremin.dev/actions/docker-login@v3
         with:
           registry: cremin.dev
           username: ${{ github.actor }}
           password: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
-          logout: false
       - name: Check out repository
         uses: https://cremin.dev/actions/checkout@v4
-      - name: Build image
-        uses: https://cremin.dev/actions/buildah-build@v2
+      - name: Set up Docker Buildx
+        uses: https://cremin.dev/actions/docker-setup-buildx@v3
+      - name: Build and push
+        uses: https://cremin.dev/actions/docker-build-push@v6
         with:
-          containerfiles: ./Containerfile
+          file: ./Containerfile
           context: ./
-          oci: true
-          layers: true
-          image: cremin.dev/jonathan/hostr
-          tags: latest ${{ github.sha }}
-      - name: Push image
-        uses: https://cremin.dev/actions/push-to-registry@v2
-        with:
-          registry: cremin.dev
-          username: ${{ github.actor }}
-          password: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
-          image: jonathan/hostr
-          tags: latest ${{ github.sha }}
+          tags: cremin.dev/jonathan/hostr:latest cremin.dev/jonathan/hostr:${{ github.sha }}
+          push: true
   test-image:
     runs-on: self-hosted
     needs: build-image
@@ -76,4 +67,4 @@ jobs:
           AWS_SECRET_ACCESS_KEY: 0kWP/ZkgIwQzgL9t4SGv9Uc93rO//OdyqMH329b/
           AWS_BUCKET: hostr
         run: |
-          podman run --rm --env-host -it cremin.dev/jonathan/hostr:${{ github.sha }} yarn test
+          docker run --rm --env-host -it cremin.dev/jonathan/hostr:${{ github.sha }} yarn test