From 45783c669758b85eb0437f891f42b265a8b850c7 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Sun, 24 May 2026 21:48:17 -0400 Subject: [PATCH] try a glibc compatable base Signed-off-by: Scott Andrews --- .github/workflows/publish.yaml | 2 +- Dockerfile | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 5dda1f5..37ac2e5 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -68,7 +68,7 @@ jobs: digest="$(crane digest "${{ env.image }}" || echo -n '')" echo "digest=${digest}" | tee -a "${GITHUB_OUTPUT}" - base="cgr.dev/chainguard/static:latest" + base="cgr.dev/chainguard/glibc-dynamic:latest" echo "base=${base}" | tee -a "${GITHUB_OUTPUT}" base_digest="$(crane digest "${base}")" echo "base-digest=${base_digest}" | tee -a "${GITHUB_OUTPUT}" diff --git a/Dockerfile b/Dockerfile index 32b4fc3..426e758 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,21 +2,14 @@ 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" \ + cargo install --locked \ --git https://github.com/bytecodealliance/wasmtime.git \ --rev "${wasmtime_git_rev}" \ - --locked \ wasmtime-cli \ ; \ else \ - cargo install \ - --target "$(arch)-unknown-linux-musl" \ - --locked \ + cargo install --locked \ wasmtime-cli@${wasmtime_crate} \ ; \ fi