Merge pull request moby#5582 from tonistiigi/update-xx-alpine-3.21

update xx to v1.6.1, alpine to 3.21
FlaminHOT7 · Dec 10, 2024 · f60ac4a · f60ac4a
2 parents 55a7483 + 6126614
commit f60ac4a
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -19,8 +19,8 @@ ARG GOTESTSUM_VERSION=v1.9.0
 ARG DELVE_VERSION=v1.23.1
 
 ARG GO_VERSION=1.23
-ARG ALPINE_VERSION=3.20
-ARG XX_VERSION=1.5.0
+ARG ALPINE_VERSION=3.21
+ARG XX_VERSION=1.6.1
 ARG BUILDKIT_DEBUG
 
 # minio for s3 integration tests

diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile
@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile-upstream:master
 
 ARG GO_VERSION=1.23
-ARG ALPINE_VERSION=3.20
-ARG XX_VERSION=1.5.0
+ARG ALPINE_VERSION=3.21
+ARG XX_VERSION=1.6.1
 
 # xx is a helper for cross-compilation
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

diff --git a/hack/dockerfiles/archutil.Dockerfile b/hack/dockerfiles/archutil.Dockerfile
@@ -2,7 +2,7 @@
 # check=error=true
 
 ARG GO_VERSION=1.23
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 ARG DEBIAN_VERSION=trixie
 
 ARG BUILD_LOONG64=${TARGETPLATFORM#linux/amd64}

diff --git a/hack/dockerfiles/authors.Dockerfile b/hack/dockerfiles/authors.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile-upstream:master
 
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 
 FROM alpine:${ALPINE_VERSION} AS gen
 RUN apk add --no-cache git

diff --git a/hack/dockerfiles/docs-dockerfile.Dockerfile b/hack/dockerfiles/docs-dockerfile.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG GO_VERSION=1.23
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest
 

diff --git a/hack/dockerfiles/docs.Dockerfile b/hack/dockerfiles/docs.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG GO_VERSION=1.23
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest
 

diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile
@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile-upstream:master
 
 ARG GO_VERSION=1.23
-ARG ALPINE_VERSION=3.20
-ARG XX_VERSION=1.5.0
+ARG ALPINE_VERSION=3.21
+ARG XX_VERSION=1.6.1
 ARG PROTOLINT_VERSION=0.50.5
 ARG GOLANGCI_LINT_VERSION=1.61.0
 ARG GOPLS_VERSION=v0.26.0

diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile-upstream:master
 
 ARG GO_VERSION=1.23
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 ARG MODOUTDATED_VERSION=v0.9.0
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base