From e2760442455469db47cebec34b09f491a563a7f1 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 9 Dec 2024 19:02:44 -0800 Subject: [PATCH 1/2] update xx to v1.6.1 Signed-off-by: Tonis Tiigi --- Dockerfile | 2 +- frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile | 2 +- hack/dockerfiles/lint.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e674530280a..7be38bfd7669 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ ARG DELVE_VERSION=v1.23.1 ARG GO_VERSION=1.23 ARG ALPINE_VERSION=3.20 -ARG XX_VERSION=1.5.0 +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 index 768ecb9f7cf3..e60aede7ef31 100644 --- a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile +++ b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile @@ -2,7 +2,7 @@ ARG GO_VERSION=1.23 ARG ALPINE_VERSION=3.20 -ARG XX_VERSION=1.5.0 +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/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index e99f6be1207b..cd9c6100ff1a 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -2,7 +2,7 @@ ARG GO_VERSION=1.23 ARG ALPINE_VERSION=3.20 -ARG XX_VERSION=1.5.0 +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 From 6126614b5c80a7c433ca38793bb7312b7f43492b Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 9 Dec 2024 19:03:06 -0800 Subject: [PATCH 2/2] update Alpine to v3.21 Signed-off-by: Tonis Tiigi --- Dockerfile | 2 +- frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile | 2 +- hack/dockerfiles/archutil.Dockerfile | 2 +- hack/dockerfiles/authors.Dockerfile | 2 +- hack/dockerfiles/docs-dockerfile.Dockerfile | 2 +- hack/dockerfiles/docs.Dockerfile | 2 +- hack/dockerfiles/lint.Dockerfile | 2 +- hack/dockerfiles/vendor.Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7be38bfd7669..cb840c6106e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ ARG GOTESTSUM_VERSION=v1.9.0 ARG DELVE_VERSION=v1.23.1 ARG GO_VERSION=1.23 -ARG ALPINE_VERSION=3.20 +ARG ALPINE_VERSION=3.21 ARG XX_VERSION=1.6.1 ARG BUILDKIT_DEBUG diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile index e60aede7ef31..f5e86234f97c 100644 --- a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile +++ b/frontend/dockerfile/cmd/dockerfile-frontend/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 XX_VERSION=1.6.1 # xx is a helper for cross-compilation diff --git a/hack/dockerfiles/archutil.Dockerfile b/hack/dockerfiles/archutil.Dockerfile index 114e86d474c9..38d329e05f1a 100644 --- 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 index 86ec5d18a037..ab68f42b66e3 100644 --- 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 index f939d262aebb..2d3d4bfdace8 100644 --- 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 index 7b7f8c22a3a4..338c3e11561b 100644 --- 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 index cd9c6100ff1a..94b7a8152de2 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.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 XX_VERSION=1.6.1 ARG PROTOLINT_VERSION=0.50.5 ARG GOLANGCI_LINT_VERSION=1.61.0 diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile index c57c6b99ed01..00ac4ac0f6db 100644 --- 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