From 8e7b27cc36f02da6a02099be3bc5a59e42bcb1b6 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 25 May 2024 16:19:53 +0300 Subject: [PATCH] Update Alpine to version 3.20 (#4583) - needed to add double quotes, otherwise it was parsed as 3.2 instead of 3.20 --- docker/DockerSettings.yaml | 2 +- docker/Dockerfile.alpine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/DockerSettings.yaml b/docker/DockerSettings.yaml index d22a5ee5..3d2b7d40 100644 --- a/docker/DockerSettings.yaml +++ b/docker/DockerSettings.yaml @@ -6,7 +6,7 @@ vault_image_digest: "sha256:784838b15c775c81b29e8979aaac36dc5ef44ea18ff0adb7fc56 xx_image_digest: "sha256:0cd3f05c72d6c9b038eb135f91376ee1169ef3a330d34e418e65e2a5c2e9c0d4" rust_version: 1.78.0 # Rust version to be used debian_version: bookworm # Debian release name to be used -alpine_version: 3.19 # Alpine version to be used +alpine_version: "3.20" # Alpine version to be used # For which platforms/architectures will we try to build images platforms: ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/arm/v6"] # Determine the build images per OS/Arch diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index c2b5452c..11eaafa6 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -127,7 +127,7 @@ RUN source /env-cargo && \ # To uninstall: docker run --privileged --rm tonistiigi/binfmt --uninstall 'qemu-*' # # We need to add `--platform` here, because of a podman bug: https://github.com/containers/buildah/issues/4742 -FROM --platform=$TARGETPLATFORM docker.io/library/alpine:3.19 +FROM --platform=$TARGETPLATFORM docker.io/library/alpine:3.20 ENV ROCKET_PROFILE="release" \ ROCKET_ADDRESS=0.0.0.0 \