Skip to content

Commit f60ac4a

Browse files
authored
Merge pull request moby#5582 from tonistiigi/update-xx-alpine-3.21
update xx to v1.6.1, alpine to 3.21
2 parents 55a7483 + 6126614 commit f60ac4a

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ ARG GOTESTSUM_VERSION=v1.9.0
1919
ARG DELVE_VERSION=v1.23.1
2020

2121
ARG GO_VERSION=1.23
22-
ARG ALPINE_VERSION=3.20
23-
ARG XX_VERSION=1.5.0
22+
ARG ALPINE_VERSION=3.21
23+
ARG XX_VERSION=1.6.1
2424
ARG BUILDKIT_DEBUG
2525

2626
# minio for s3 integration tests

frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# syntax=docker/dockerfile-upstream:master
22

33
ARG GO_VERSION=1.23
4-
ARG ALPINE_VERSION=3.20
5-
ARG XX_VERSION=1.5.0
4+
ARG ALPINE_VERSION=3.21
5+
ARG XX_VERSION=1.6.1
66

77
# xx is a helper for cross-compilation
88
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

hack/dockerfiles/archutil.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# check=error=true
33

44
ARG GO_VERSION=1.23
5-
ARG ALPINE_VERSION=3.20
5+
ARG ALPINE_VERSION=3.21
66
ARG DEBIAN_VERSION=trixie
77

88
ARG BUILD_LOONG64=${TARGETPLATFORM#linux/amd64}

hack/dockerfiles/authors.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile-upstream:master
22

3-
ARG ALPINE_VERSION=3.20
3+
ARG ALPINE_VERSION=3.21
44

55
FROM alpine:${ALPINE_VERSION} AS gen
66
RUN apk add --no-cache git

hack/dockerfiles/docs-dockerfile.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22

33
ARG GO_VERSION=1.23
4-
ARG ALPINE_VERSION=3.20
4+
ARG ALPINE_VERSION=3.21
55

66
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest
77

hack/dockerfiles/docs.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22

33
ARG GO_VERSION=1.23
4-
ARG ALPINE_VERSION=3.20
4+
ARG ALPINE_VERSION=3.21
55

66
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest
77

hack/dockerfiles/lint.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# syntax=docker/dockerfile-upstream:master
22

33
ARG GO_VERSION=1.23
4-
ARG ALPINE_VERSION=3.20
5-
ARG XX_VERSION=1.5.0
4+
ARG ALPINE_VERSION=3.21
5+
ARG XX_VERSION=1.6.1
66
ARG PROTOLINT_VERSION=0.50.5
77
ARG GOLANGCI_LINT_VERSION=1.61.0
88
ARG GOPLS_VERSION=v0.26.0

hack/dockerfiles/vendor.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile-upstream:master
22

33
ARG GO_VERSION=1.23
4-
ARG ALPINE_VERSION=3.20
4+
ARG ALPINE_VERSION=3.21
55
ARG MODOUTDATED_VERSION=v0.9.0
66

77
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base

0 commit comments

Comments
 (0)