Multi-arch build (#19)

* multi-arch build take one

* fix platform typo

* fix another typo

* include setup-qemu-action so we can build multi-platform

* use buildx to build

* see if single-arch works

* add --load to Docker build command

* try another lengthy multi-arch build now that we think the issues are fixed

* try to build and push the images in one go...

* build and push in one go

* remove unnecessary Makefile variable

* remove deprecate variable

Author: LasseHels

.github/workflows/main-push.yml

@@ -17,11 +17,11 @@ jobs:
   kubeconform:
     name: Kubeconform
     uses: ./.github/workflows/kubeconform.yml
-  build:
-    name: Build
-    uses: ./.github/workflows/build.yml
+  publish:
+    name: Publish
+    uses: ./.github/workflows/publish.yml
     secrets: inherit
     needs: [test, lint, end-to-end, kubeconform]
     with:
       version: '${{ github.sha }}'
-      push: true
+      platforms: 'linux/amd64,linux/arm64'

.github/workflows/build.yml .github/workflows/publish.yml

@@ -5,34 +5,33 @@ on:
         required: true
         type: string
         description: 'The built image will be tagged with this version'
-      push:
-        required: false
-        type: boolean
-        default: false
-        description: 'Whether to push the built image'
+      platforms:
+        required: true
+        type: string
+        default: 'linux/amd64'
+        description: 'Platform(s) for which to build the image. Example: "linux/amd64,linux/arm64".'
 
 jobs:
-  build:
+  publish:
     name: Image
     permissions:
       contents: read
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker
         uses: docker/setup-buildx-action@v3
       - name: Construct image tag
         id: tag
         run: echo "tag=${{ secrets.DOCKERHUB_USERNAME }}/tainter:${{ inputs.version }}" >> "$GITHUB_OUTPUT"
-      - name: Build image
-        run: IMAGE_TAG=${{ steps.tag.outputs.tag }} make image
-      - name: Login
+      - name: Log in
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Push image
-        if: inputs.push == true
+      - name: Build and push image
         run: |
-          docker image push ${{ steps.tag.outputs.tag }}
+          docker buildx build --push --tag ${{ steps.tag.outputs.tag }} --platform ${{ inputs.platforms }} .

.github/workflows/tag-push.yml

@@ -12,12 +12,18 @@ jobs:
   lint:
     name: Lint
     uses: ./.github/workflows/lint.yml
-  build:
-    name: Build
-    uses: ./.github/workflows/build.yml
+  end-to-end:
+    name: End-to-end
+    uses: ./.github/workflows/test-end-to-end.yml
+  kubeconform:
+    name: Kubeconform
+    uses: ./.github/workflows/kubeconform.yml
+  publish:
+    name: Publish
+    uses: ./.github/workflows/publish.yml
     secrets: inherit
-    needs: [test, lint]
+    needs: [test, lint, end-to-end, kubeconform]
     with:
       # https://github.com/orgs/community/discussions/26686#discussioncomment-3396593.
       version: '${{ github.ref_name }}'
-      push: true
+      platforms: 'linux/amd64,linux/arm64'

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.82.0-slim-bookworm as base
+FROM rust:1.82.0-slim-bookworm AS base
 RUN cargo install cargo-chef --version 0.1.68
 
 FROM base AS planner
@@ -20,4 +20,9 @@ RUN groupadd -g 10001 tainter && \
    useradd -u 10000 -g tainter tainter \
    && chown -R tainter:tainter /usr/local/bin/tainter
 USER tainter:tainter
+
+LABEL org.opencontainers.image.title="tainter"
+LABEL org.opencontainers.image.source="https://github.com/LasseHels/tainter"
+LABEL org.opencontainers.image.authors="Lasse Canth Hels <lasse@hels.dk>"
+
 ENTRYPOINT ["/usr/local/bin/tainter"]

Makefile

@@ -44,7 +44,7 @@ build:
 .PHONY: image
 image:
 	@echo "Building image with tag $(IMAGE_TAG)"
-	docker build -t $(IMAGE_TAG) .
+	docker build --tag $(IMAGE_TAG) .
 
 .PHONY: run-image
 run-image: