From 240b40f6b22c51269aefc43c3cff89f16c10cfeb Mon Sep 17 00:00:00 2001
From: sstent <stuart.stent@gmail.com>
Date: Sat, 20 Sep 2025 10:58:44 -0700
Subject: [PATCH] sync

---
 .github/workflows/container-build.yml | 26 +++++++++++++++++++-------
 nomad/minihass.nomad.hcl              |  1 -
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml
index 4a58e5d..b318b98 100644
--- a/.github/workflows/container-build.yml
+++ b/.github/workflows/container-build.yml
@@ -7,16 +7,13 @@ on:
       - main
     paths:
       - 'app.py'
-      - 'dockerfile'
+      - 'Dockerfile'
       - 'requirements.txt'
       - 'docker-compose.yml'
 
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [amd64, arm64]
     permissions:
       contents: read
       packages: write
@@ -35,15 +32,30 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Create multi-arch Dockerfile
+        run: |
+          cat > Dockerfile <<EOF
+          FROM --platform=\$BUILDPLATFORM python:3.11-slim as builder
+
+          WORKDIR /app
+          COPY requirements.txt .
+          RUN pip install --no-cache-dir -r requirements.txt
+
+          FROM python:3.11-slim
+          WORKDIR /app
+          COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
+          COPY --from=builder /usr/local/bin /usr/local/bin
+          COPY . .
+
+          CMD ["python", "app.py"]
+          EOF
 
       - name: Build and push multi-arch Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
-          platforms: linux/${{ matrix.arch }}
-          build-args: |
-            TARGETARCH=${{ matrix.arch }}
+          platforms: linux/amd64,linux/arm64
           tags: |
             ghcr.io/${{ github.repository }}:latest
             ghcr.io/${{ github.repository }}:${{ github.sha }}
diff --git a/nomad/minihass.nomad.hcl b/nomad/minihass.nomad.hcl
index 52c7cae..4aee21a 100644
--- a/nomad/minihass.nomad.hcl
+++ b/nomad/minihass.nomad.hcl
@@ -27,7 +27,6 @@ job "minihass" {
       config {
         image = "ghcr.io/sstent/MiniHASS:latest"
         ports = ["http"]
-        platform = "linux/${attr.cpu.arch}"
       }
 
       env {