From 166cac3e734e66710a1e7ab83f30553f31b71ae5 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Wed, 18 Oct 2023 08:29:58 +0200
Subject: [PATCH 1/3] Dockerfile: update xx to 1.3.0

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit 5955ccf77c3618970d336821fd75857155f9b6b9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3f31d3c5eccd..f31a6ba1adfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,7 @@ ARG AZURITE_VERSION=3.18.0
 
 ARG GO_VERSION=1.19
 ARG ALPINE_VERSION=3.17
+ARG XX_VERSION=1.3.0
 
 # minio for s3 integration tests
 FROM minio/minio:${MINIO_VERSION} AS minio
@@ -33,7 +34,7 @@ FROM alpine:edge@sha256:c223f84e05c23c0571ce8decefef818864869187e1a3ea47719412e2
 FROM alpine-$TARGETARCH AS alpinebase
 
 # xx is a helper for cross-compilation
-FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.2.1 AS xx
+FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 
 # go base image
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest

From 807630371fe970f1a317d154c93f079cf9cfad58 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Thu, 13 Jul 2023 02:52:49 +0200
Subject: [PATCH 2/3] hack: align syntax

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit bb18da8347f6e8f6c810f28d70d5c6ba23bf63bf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 hack/images |  6 +++---
 hack/test   | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/hack/images b/hack/images
index d1315e6a17ef..5f536557f048 100755
--- a/hack/images
+++ b/hack/images
@@ -7,9 +7,9 @@ PUSH=$3
 . $(dirname $0)/util
 set -eu -o pipefail
 
-: ${RELEASE=false}
-: ${PLATFORMS=}
-: ${TARGET=}
+: "${RELEASE=false}"
+: "${PLATFORMS=}"
+: "${TARGET=}"
 
 versionTag=$(git describe --always --tags --match "v[0-9]*")
 
diff --git a/hack/test b/hack/test
index cf928f70c11f..b1f88483498d 100755
--- a/hack/test
+++ b/hack/test
@@ -3,17 +3,17 @@
 . $(dirname $0)/util
 set -eu -o pipefail
 
-: ${GO_VERSION=}
-: ${TEST_INTEGRATION=}
-: ${TEST_GATEWAY=}
-: ${TEST_DOCKERFILE=}
-: ${TEST_DOCKERD=}
-: ${TEST_DOCKERD_BINARY=$(which dockerd)}
-: ${TEST_COVERAGE=}
-: ${TEST_KEEP_CACHE=}
-: ${DOCKERFILE_RELEASES=}
-: ${BUILDKIT_WORKER_RANDOM=}
-: ${BUILDKITD_TAGS=}
+: "${GO_VERSION=}"
+: "${TEST_INTEGRATION=}"
+: "${TEST_GATEWAY=}"
+: "${TEST_DOCKERFILE=}"
+: "${TEST_DOCKERD=}"
+: "${TEST_DOCKERD_BINARY=$(which dockerd)}"
+: "${TEST_COVERAGE=}"
+: "${TEST_KEEP_CACHE=}"
+: "${DOCKERFILE_RELEASES=}"
+: "${BUILDKIT_WORKER_RANDOM=}"
+: "${BUILDKITD_TAGS=}"
 
 if [ "$TEST_DOCKERD" == "1" ]; then
   if [ ! -f "$TEST_DOCKERD_BINARY" ]; then

From df0923f985b704971cf55c90c660af7cc27d200c Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 10 Jan 2024 13:43:32 +0100
Subject: [PATCH 3/3] hack/test: allow ALPINE_VERSION to be set from env

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 295c8993742d1d72d400f215c4b2ae795d5d2906)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 hack/test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hack/test b/hack/test
index b1f88483498d..096753a8f041 100755
--- a/hack/test
+++ b/hack/test
@@ -3,6 +3,7 @@
 . $(dirname $0)/util
 set -eu -o pipefail
 
+: "${ALPINE_VERSION=}"
 : "${GO_VERSION=}"
 : "${TEST_INTEGRATION=}"
 : "${TEST_GATEWAY=}"
@@ -62,6 +63,7 @@ if [ "$TEST_COVERAGE" = "1" ]; then
 fi
 
 buildxCmd build $cacheFromFlags \
+  --build-arg ALPINE_VERSION \
   --build-arg GO_VERSION \
   --build-arg "BUILDKITD_TAGS=$BUILDKITD_TAGS" \
   --target "integration-tests" \