Skip to content

Commit

Permalink
Fix multiarch docker image for arm64 users (#125)
Browse files Browse the repository at this point in the history
* Fix multiarch docker image for arm64 users

* Update changelog

* Also publish 'latest' tag

* Remove specific variant

This variant will be set by Docker/containerd. Until we support multiple arm variants we can use this simple notation.
  • Loading branch information
hatchan committed Aug 24, 2023
1 parent 4c620a9 commit 189a285
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ jobs:

- name: Prepare files
run: |
mkdir -p build/linux/{amd64,arm64v8}/
mkdir -p build/linux/{amd64,arm64}/
mv artifacts/am-linux-x86_64/am build/linux/amd64/am
mv artifacts/am-linux-aarch64/am build/linux/arm64v8/am
chmod u+x build/linux/{amd64,arm64v8}/am
mv artifacts/am-linux-aarch64/am build/linux/arm64/am
chmod u+x build/linux/{amd64,arm64}/am
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand All @@ -112,10 +112,11 @@ jobs:
with:
file: Dockerfile.release
context: build
platforms: linux/amd64,linux/arm64v8
platforms: linux/amd64,linux/arm64
push: true
tags: |
fiberplane/am:v${{ needs.validate-version.outputs.version }}
fiberplane/am:latest
cache-from: type=gha
cache-to: type=gha,mode=max

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.3.0]

- SHA-256 checksums are now provided for all artifact downloads (#101)
- Added self updater (#102)
- Use `clap-markdown` fork that enables formatting by display name (#103)
Expand All @@ -15,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- The generated Prometheus config now gets stored in a unique, temporary location (#113)
- Added new subcommand `init` to create a config file interactively (#117)
- `am` is now available as a multi-arch Docker container on [Docker Hub](https://hub.docker.com/repository/docker/fiberplane/am/general) (#118)
- Fix multiarch docker image for arm64 users (#125)

## [0.2.1]

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Use the context that contains the am binaries in the `$OS/$ARCH/am` structure.
# NOTE: Windows is currently not supported

FROM ${TARGETARCH}/debian:bookworm-slim
FROM debian:bookworm-slim

# These variables _should_ be set by docker buildx
ARG TARGETARCH
Expand Down

0 comments on commit 189a285

Please sign in to comment.