Fix docker builds (#242)

.github/workflows/build-images.yml

@@ -0,0 +1,71 @@
+name: "Build Images"
+on:
+  release:
+    types: [published]
+
+  # FIXME: these variables don't seem to work at all
+  workflow_call:
+    inputs:
+      push:
+        description: 'Should the images be pushed'
+        default: false
+        required: false
+        type: boolean
+      version:
+        description: 'The version used when tagging the image'
+        default: 'dev'
+        required: false
+        type: string
+jobs:
+  build_and_push_images:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    env:
+      RELEASE_VERSION: "${{ github.event.release.tag_name }}"
+      DOCKERHUB_REPO: "drewhammond/chefbrowser"
+      GHCR_REPO: "ghcr.io/drewhammond/chefbrowser"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.DOCKERHUB_REPO }}
+            ${{ env.GHCR_REPO }}
+          tags: |
+            type=semver,pattern={{version}}
+      - name: Log in to Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push images
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha

Dockerfile

@@ -3,7 +3,7 @@ ARG USERNAME=chefbrowser
 ARG UID=1001
 ARG GID=1001
 
-FROM $BASE_IMAGE as cb-base
+FROM --platform=$BUILDPLATFORM $BASE_IMAGE as cb-base
 ARG USERNAME
 ARG UID
 ARG GID

Makefile

@@ -47,5 +47,5 @@ build-linux:
 	GOOS=linux GOARCH=amd64 TARGET_ARCH=linux/amd64 $(MAKE) build
 
 .PHONY: build-docker
-build-docker: build-linux
+build-docker:
 	docker build --no-cache -t $(DOCKER_NAMESPACE)/$(BINARY_NAME):$(DOCKER_TAG) -f Dockerfile .