diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 5dda1f5..3065363 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -110,7 +110,7 @@ jobs: --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 32b4fc3..e8a3aa7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,8 @@ 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 ; \ if [ "${wasmtime_crate}" = "" ] ; then \ cargo install \ - --target "$(arch)-unknown-linux-musl" \ --git https://github.com/bytecodealliance/wasmtime.git \ --rev "${wasmtime_git_rev}" \ --locked \ @@ -15,7 +11,6 @@ RUN \ ; \ else \ cargo install \ - --target "$(arch)-unknown-linux-musl" \ --locked \ wasmtime-cli@${wasmtime_crate} \ ; \