Switch to personal musl base images

- no longer bundles libpq v11, only v15 is necessary
dfunkt · Aug 1, 2024 · 575f431 · 575f431
1 parent d9ce276
commit 575f431
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/docker/DockerSettings.yaml b/docker/DockerSettings.yaml
@@ -18,11 +18,11 @@ build_stage_image:
     image: "build_${TARGETARCH}${TARGETVARIANT}"
     platform: "linux/amd64" # The Alpine build images only have linux/amd64 images
     arch_image:
-      amd64: "ghcr.io/blackdex/rust-musl:x86_64-musl-stable-{{rust_version}}"
-      amd64v3: "ghcr.io/blackdex/rust-musl:x86_64-musl-stable-{{rust_version}}"
-      arm64: "ghcr.io/blackdex/rust-musl:aarch64-musl-stable-{{rust_version}}"
-      armv7: "ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-{{rust_version}}"
-      armv6: "ghcr.io/blackdex/rust-musl:arm-musleabi-stable-{{rust_version}}"
+      amd64: "ghcr.io/dfunkt/rust-musl:x86_64-musl-stable-{{rust_version}}"
+      amd64v3: "ghcr.io/dfunkt/rust-musl:x86_64-musl-stable-{{rust_version}}"
+      arm64: "ghcr.io/dfunkt/rust-musl:aarch64-musl-stable-{{rust_version}}"
+      armv7: "ghcr.io/dfunkt/rust-musl:armv7-musleabihf-stable-{{rust_version}}"
+      armv6: "ghcr.io/dfunkt/rust-musl:arm-musleabi-stable-{{rust_version}}"
 # The final image which will be used to distribute the container images
 runtime_stage_image:
   debian: "docker.io/library/debian:{{debian_version}}-slim"

diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
@@ -32,11 +32,11 @@ FROM --platform=linux/amd64 ghcr.io/dfunkt/bw_web_builds@sha256:eac3e997a55bee69
 ########################## ALPINE BUILD IMAGES ##########################
 ## NOTE: The Alpine Base Images do not support other platforms then linux/amd64
 ## And for Alpine we define all build images here, they will only be loaded when actually used
-FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.80.0 AS build_amd64
-FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:x86_64-musl-stable-1.80.0 AS build_amd64v3
-FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:aarch64-musl-stable-1.80.0 AS build_arm64
-FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:armv7-musleabihf-stable-1.80.0 AS build_armv7
-FROM --platform=linux/amd64 ghcr.io/blackdex/rust-musl:arm-musleabi-stable-1.80.0 AS build_armv6
+FROM --platform=linux/amd64 ghcr.io/dfunkt/rust-musl:x86_64-musl-stable-1.80.0 AS build_amd64
+FROM --platform=linux/amd64 ghcr.io/dfunkt/rust-musl:x86_64-musl-stable-1.80.0 AS build_amd64v3
+FROM --platform=linux/amd64 ghcr.io/dfunkt/rust-musl:aarch64-musl-stable-1.80.0 AS build_arm64
+FROM --platform=linux/amd64 ghcr.io/dfunkt/rust-musl:armv7-musleabihf-stable-1.80.0 AS build_armv7
+FROM --platform=linux/amd64 ghcr.io/dfunkt/rust-musl:arm-musleabi-stable-1.80.0 AS build_armv6
 
 ########################## BUILD IMAGE ##########################
 # hadolint ignore=DL3006