From b21da8c34975ed0ac9bb67786096b03bf641e844 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Mon, 25 May 2026 21:07:59 -0400 Subject: [PATCH 1/2] Use alpine based builder Signed-off-by: Scott Andrews --- .github/workflows/publish.yaml | 3 +-- Dockerfile | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 78d4a74..f456866 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -105,12 +105,11 @@ jobs: docker buildx build \ --builder container \ --output type=oci,dest="./wasmtime-${{ inputs.tag }}-${{ matrix.arch }}.tar" \ - --platform "linux/${{ matrix.arch }}" \ --build-arg "SOURCE_DATE_EPOCH=$(date -d "${{ needs.preflight.outputs.wasmtime-commit-date }}" +%s)" \ --build-arg "wasmtime_crate=${{ inputs.wasmtime-crate }}" \ --build-arg "wasmtime_git_rev=${{ inputs.wasmtime-git-sha }}" \ --build-arg "from_base=${{ needs.preflight.outputs.base }}@${{ needs.preflight.outputs.base-digest }}" \ - --build-arg "from_build=rust:${{ inputs.rust-version }}" \ + --build-arg "from_build=rust:${{ inputs.rust-version }}-alpine" \ --label org.opencontainers.image.authors="Bytecode Alliance " \ --label org.opencontainers.image.base.digest="${{ needs.preflight.outputs.base-digest }}" \ --label org.opencontainers.image.base.name="${{ needs.preflight.outputs.base }}" \ diff --git a/Dockerfile b/Dockerfile index 09688b3..3dab9c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,9 @@ ARG from_build from_base FROM ${from_build} AS build ARG wasmtime_crate wasmtime_git_rev RUN \ - apt-get update ; \ - apt-get install gcc-$(arch | tr _ -)-linux-gnu musl-tools -y ; \ - rustup target add $(arch)-unknown-linux-musl ; \ cargo install --locked cargo-auditable ; \ if [ "${wasmtime_crate}" = "" ] ; then \ cargo auditable install \ - --target "$(arch)-unknown-linux-musl" \ --git https://github.com/bytecodealliance/wasmtime.git \ --rev "${wasmtime_git_rev}" \ --locked \ @@ -16,7 +12,6 @@ RUN \ ; \ else \ cargo auditable install \ - --target "$(arch)-unknown-linux-musl" \ --locked \ wasmtime-cli@${wasmtime_crate} \ ; \ From 03fe6b40b3af258a1b64ea36f98ac1a32904aa92 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Tue, 26 May 2026 10:28:52 -0400 Subject: [PATCH 2/2] Back off platform changes Signed-off-by: Scott Andrews --- .github/workflows/publish.yaml | 1 + Dockerfile | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f456866..b771d6f 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -105,6 +105,7 @@ jobs: docker buildx build \ --builder container \ --output type=oci,dest="./wasmtime-${{ inputs.tag }}-${{ matrix.arch }}.tar" \ + --platform "linux/${{ matrix.arch }}" \ --build-arg "SOURCE_DATE_EPOCH=$(date -d "${{ needs.preflight.outputs.wasmtime-commit-date }}" +%s)" \ --build-arg "wasmtime_crate=${{ inputs.wasmtime-crate }}" \ --build-arg "wasmtime_git_rev=${{ inputs.wasmtime-git-sha }}" \ diff --git a/Dockerfile b/Dockerfile index 3dab9c1..c8a0269 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ RUN \ cargo install --locked cargo-auditable ; \ if [ "${wasmtime_crate}" = "" ] ; then \ cargo auditable install \ + --target "$(arch)-unknown-linux-musl" \ --git https://github.com/bytecodealliance/wasmtime.git \ --rev "${wasmtime_git_rev}" \ --locked \ @@ -12,6 +13,7 @@ RUN \ ; \ else \ cargo auditable install \ + --target "$(arch)-unknown-linux-musl" \ --locked \ wasmtime-cli@${wasmtime_crate} \ ; \