From 9475e1637959b4849fb77119c52ba27a19313014 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Sat, 21 Dec 2024 07:16:50 -0500 Subject: [PATCH] Pin Docker image to Alpine 3.20 for keyring build Signed-off-by: Timothy Johnson --- packages/secrets/src/keyring/Cross.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/secrets/src/keyring/Cross.toml b/packages/secrets/src/keyring/Cross.toml index 106f07ec29..5a5f5826f8 100644 --- a/packages/secrets/src/keyring/Cross.toml +++ b/packages/secrets/src/keyring/Cross.toml @@ -15,11 +15,11 @@ passthrough = [ image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" [target.aarch64-unknown-linux-musl] -image = "rust:alpine" +image = "rust:alpine3.20" pre-build = [ "wget -qO- https://musl.cc/aarch64-linux-musl-cross.tgz | tar -xzC / && export PATH=\"/aarch64-linux-musl-cross/bin:$PATH\"", "apk add --no-cache musl-dev pkgconfig", - "apk add -p /aarch64-linux-musl-cross --initdb --arch aarch64 --allow-untrusted -X \"https://dl-cdn.alpinelinux.org/alpine/latest-stable/main/\" --no-cache --no-scripts libsecret-dev", + "apk add -p /aarch64-linux-musl-cross --initdb --arch aarch64 --allow-untrusted -X $(head -n 1 /etc/apk/repositories) --no-cache --no-scripts libsecret-dev", "rustup target add aarch64-unknown-linux-musl" ] @@ -33,5 +33,5 @@ image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:main" image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main" [target.x86_64-unknown-linux-musl] -image = "rust:alpine" +image = "rust:alpine3.20" pre-build = ["apk add libsecret-dev musl-dev"]