From 0356be11132a1730cdeae1d2a357a16a0cd67f7c Mon Sep 17 00:00:00 2001
From: Derek Holloway <derek@mistox.com>
Date: Thu, 3 Sep 2026 08:32:10 -0700
Subject: [PATCH] Update runners for cache invalidation

---
 .gitea/workflows/build.yaml | 110 ++++++++++++++++++++----------------
 1 file changed, 62 insertions(+), 48 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 0f8bad8..9a2b151 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -14,23 +14,36 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: build and push comfyui-cuda
+      - name: Log in to registry
         run: |
-          docker buildx build \
-          --platform=linux/arm64 \
-          -t mistox/comfyui-cuda-ampere:latest \
-          -f comfyui-cuda-dockerfile \
-          --push \
-          .
+          printf '%s' '${{ secrets.DOCKERHUB_TOKEN }}' |
+          podman login docker.mistox.net \
+          --username '${{ secrets.DOCKERHUB_USERNAME }}' \
+          --password-stdin
+
+      - name: Get Upstream Commit SHA
+        id: get-sha
+        run: |
+          SHA=$(curl -sSL \
+          -H "Accept: application/vnd.github+json" \
+          "https://api.github.com/repos/comfy-org/comfyui/commits?sha=master&per_page=1" \
+          | jq -r '.[0].sha')
+          echo "sha=$SHA" >> $GITHUB_OUTPUT
+          
+      - name: Get Upstream Commit SHA
+        id: get-sha
+        run: |
+          SHA=$(curl -s https://api.github.com/repos/mythrantic/ollama-docker/commits/main | jq -r '.sha')
+          echo "sha=$SHA" >> $GITHUB_OUTPUT
+
+      - name: Build and Push ComfyUI-Cuda
+        run: |
+          podman build \
+            -t docker.mistox.net/derek/comfyui-cuda-ampere:latest \
+            -f ${{ github.workspace }}/comfyui-cuda-dockerfile \
+            --build-arg gitversion=${{ steps.get-sha.outputs.sha }} \
+            ${{ github.workspace }}
+          podman push docker.mistox.net/derek/comfyui-cuda-ampere:latest
 
   # Build ComfyUI-Rocm
   build-rocm:
@@ -39,23 +52,20 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: build and push comfyui-rocm
+      - name: Log in to registry
         run: |
-          docker buildx build \
-          --platform=linux/arm64 \
-          -t mistox/comfyui-rocm-ampere:latest \
-          -f comfyui-rocm-dockerfile \
-          --push \
-          .
+          printf '%s' '${{ secrets.DOCKERHUB_TOKEN }}' |
+          podman login docker.mistox.net \
+          --username '${{ secrets.DOCKERHUB_USERNAME }}' \
+          --password-stdin
+
+      - name: Build and Push ComfyUI-Rocm
+        run: |
+          podman build \
+            -t docker.mistox.net/derek/comfyui-rocm-ampere:latest \
+            -f ${{ github.workspace }}/comfyui-rocm-dockerfile \
+            ${{ github.workspace }}
+          podman push docker.mistox.net/derek/comfyui-rocm-ampere:latest
 
   # Job 3: Uvicorn Build
   build-uvicorn:
@@ -64,20 +74,24 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: build and push uvicorn
+      - name: Log in to registry
         run: |
-          docker buildx build \
-          --platform=linux/arm64 \
-          -t mistox/uvicorn-ampere:latest \
-          -f uvicorn-dockerfile \
-          --push \
-          .
\ No newline at end of file
+          printf '%s' '${{ secrets.DOCKERHUB_TOKEN }}' |
+          podman login docker.mistox.net \
+          --username '${{ secrets.DOCKERHUB_USERNAME }}' \
+          --password-stdin
+
+      - name: Get Upstream Commit SHA
+        id: get-sha
+        run: |
+          SHA=$(curl -s https://api.github.com/repos/mythrantic/ollama-docker/commits/main | jq -r '.sha')
+          echo "sha=$SHA" >> $GITHUB_OUTPUT
+
+      - name: Build and Push Uvicorn
+        run: |
+          podman build \
+            -t docker.mistox.net/derek/uvicorn-ampere:latest \
+            -f ${{ github.workspace }}/uvicorn-dockerfile \
+            --build-arg gitversion=${{ steps.get-sha.outputs.sha }} \
+            ${{ github.workspace }}
+          podman push docker.mistox.net/derek/uvicorn-ampere:latest
\ No newline at end of file