From dd25cd2d2bc88269a0b22754cae7216627ec8770 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Mon, 10 Jul 2023 13:09:07 +0200 Subject: [PATCH 1/4] Dockerfile: update to xx 1.2.1 Signed-off-by: CrazyMax (cherry picked from commit fca67dd817164d00923a359e2bef945adc2a1a8c) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49b7aa1b753e..d89cd63372c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_VARIANT=alpine ARG GO_VERSION=1.22.6 ARG ALPINE_VERSION=3.20 -ARG XX_VERSION=1.1.1 +ARG XX_VERSION=1.2.1 ARG GOVERSIONINFO_VERSION=v1.3.0 ARG GOTESTSUM_VERSION=v1.10.0 ARG BUILDX_VERSION=0.11.2 From 9a594cbe33d907a8260f51e2d478b44f1f319e9e Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Mon, 11 Mar 2024 14:24:26 +0100 Subject: [PATCH 2/4] Dockerfile: update to xx 1.4.0 Signed-off-by: CrazyMax (cherry picked from commit adb018084c669f95f8eef49dc986b8023d4f8f46) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d89cd63372c2..c235773fbcb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_VARIANT=alpine ARG GO_VERSION=1.22.6 ARG ALPINE_VERSION=3.20 -ARG XX_VERSION=1.2.1 +ARG XX_VERSION=1.4.0 ARG GOVERSIONINFO_VERSION=v1.3.0 ARG GOTESTSUM_VERSION=v1.10.0 ARG BUILDX_VERSION=0.11.2 From 3d49d403c757b12ff20bfe3d7b70829649a4d783 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 2 Sep 2024 16:48:29 +0200 Subject: [PATCH 3/4] 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 c235773fbcb2..80fb8b3ebcf8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_VARIANT=alpine ARG GO_VERSION=1.22.6 ARG ALPINE_VERSION=3.20 -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.11.2 From a7abd65c2c34e06c7d4c6129b4767502d6d5a8e6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 10 Dec 2024 10:12:58 +0100 Subject: [PATCH 4/4] 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 80fb8b3ebcf8..2b3392117630 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_VARIANT=alpine ARG GO_VERSION=1.22.6 ARG ALPINE_VERSION=3.20 -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.11.2