feat: create multi-arch container images with AMD64 and ARM64 (#38)

* feat: create multi-arch container images with AMD64 and ARM64 * fix: use joschi/dive:latest-amd64 in CI
joschi · Nov 7, 2024 · 91d6909 · 91d6909
1 parent e46f931
commit 91d6909
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 6 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -94,6 +94,12 @@ jobs:
       - name: Bootstrap environment
         uses: ./.github/actions/bootstrap
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Tag release
         run: |
           git tag ${{ github.event.inputs.version }}

diff --git a/.github/workflows/validations.yaml b/.github/workflows/validations.yaml
@@ -57,6 +57,12 @@ jobs:
       - name: Bootstrap environment
         uses: ./.github/actions/bootstrap
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build snapshot artifacts
         run: make snapshot
 

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -46,16 +46,44 @@ nfpms:
       - deb
 
 dockers:
-  - ids:
+  - id: docker-amd64
+    ids:
       - dive
-    dockerfile: Dockerfile
+    use: buildx
+    goarch: amd64
     image_templates:
-      - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:latest'
-      - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:{{ .Version }}'
+      - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:latest-amd64'
+      - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:{{ .Version }}-amd64'
     build_flag_templates:
       - "--build-arg=DOCKER_CLI_VERSION={{.Env.DOCKER_CLI_VERSION}}"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Version}}"
       - "--label=org.opencontainers.image.source={{.GitURL}}"
+      - "--platform=linux/amd64"
+  - id: docker-arm64
+    ids:
+      - dive
+    use: buildx
+    goarch: arm64
+    image_templates:
+      - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:latest-arm64'
+      - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:{{ .Version }}-arm64'
+    build_flag_templates:
+      - "--build-arg=DOCKER_CLI_VERSION={{.Env.DOCKER_CLI_VERSION}}"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.source={{.GitURL}}"
+      - "--platform=linux/arm64/v8"
+docker_manifests:
+  - name_template: '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:latest'
+    image_templates:
+      - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:latest-amd64'
+      - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:latest-arm64'
+  - name_template: '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:{{ .Version }}'
+    image_templates:
+      - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:{{ .Version }}-amd64'
+      - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:{{ .Version }}-arm64'
diff --git a/Dockerfile b/Dockerfile
@@ -7,6 +7,6 @@ RUN wget -O- https://download.docker.com/linux/static/stable/$(uname -m)/docker-
 COPY dive /usr/local/bin/
 
 FROM scratch
-COPY --from=base / /
+COPY --from=base /usr/local/bin /usr/local/bin
 
 ENTRYPOINT ["/usr/local/bin/dive"]
diff --git a/Makefile b/Makefile
@@ -186,7 +186,7 @@ ci-test-docker-image:
 		--rm \
 		-t \
 		-v /var/run/docker.sock:/var/run/docker.sock \
-		'${PRODUCTION_REGISTRY}/joschi/dive:latest' \
+		'${PRODUCTION_REGISTRY}/joschi/dive:latest-amd64' \
 			'${TEST_IMAGE}' \
 			--ci