From b00870511b68f75c7410639065775c3f8faec216 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 2 Sep 2024 16:48:29 +0200 Subject: [PATCH 1/2] Dockerfile: update xx to v1.5.0 full diff: https://github.com/tonistiigi/xx/compare/v1.4.0...v1.5.0 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 1e6cbbc3f1ee86fadc2b8a5bde89e420b8401c44) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6e97475fee21..62995dbda923 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG ALPINE_VERSION=3.20 ARG BASE_DEBIAN_DISTRO=bookworm ARG GO_VERSION=1.22.10 -ARG XX_VERSION=1.4.0 +ARG XX_VERSION=1.5.0 ARG GOVERSIONINFO_VERSION=v1.3.0 ARG GOTESTSUM_VERSION=v1.10.0 ARG BUILDX_VERSION=0.12.1 From 58f9a8908ae63a20c4d6a34c3124e954371a19cc Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 10 Dec 2024 10:12:58 +0100 Subject: [PATCH 2/2] update xx to v1.6.1 for compatibility with alpine 3.21 This fixes compatibility with alpine 3.21 - Fix additional possible `xx-cc`/`xx-cargo` compatibility issue with Alpine 3.21 - Support for Alpine 3.21 - Fix `xx-verify` with `file` 5.46+ - Fix possible error taking lock in `xx-apk` in latest Alpine without `coreutils` full diff: https://github.com/tonistiigi/xx/compare/v1.5.0...v1.6.1 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 1e51ae7af28b5b953e34b8a0e5aa67e050bb5cb1) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 62995dbda923..6a385a0f9975 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG ALPINE_VERSION=3.20 ARG BASE_DEBIAN_DISTRO=bookworm ARG GO_VERSION=1.22.10 -ARG XX_VERSION=1.5.0 +ARG XX_VERSION=1.6.1 ARG GOVERSIONINFO_VERSION=v1.3.0 ARG GOTESTSUM_VERSION=v1.10.0 ARG BUILDX_VERSION=0.12.1