From 1acf32cdc6c2a6e0298a2c3e19a2342ae84b8bac Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 9 Feb 2025 16:52:11 +0100 Subject: [PATCH] Dockerfile: dev-container: update buildx v0.20.1 Also align versions in the Dockerfile.dev Dockerfile full diff: https://github.com/docker/buildx/compare/v0.20.0...v0.20.1 Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 6 +++++- dockerfiles/Dockerfile.dev | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b4684dcd23..14d89ad187 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,11 @@ ARG GO_VERSION=1.23.6 ARG XX_VERSION=1.6.1 ARG GOVERSIONINFO_VERSION=v1.4.1 ARG GOTESTSUM_VERSION=v1.12.0 -ARG BUILDX_VERSION=0.20.0 + +# BUILDX_VERSION sets the version of buildx to use for the e2e tests. +# It must be a tag in the docker.io/docker/buildx-bin image repository +# on Docker Hub. +ARG BUILDX_VERSION=0.20.1 ARG COMPOSE_VERSION=v2.32.4 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 14efd78691..6424f9a67e 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -3,7 +3,10 @@ ARG GO_VERSION=1.23.6 ARG ALPINE_VERSION=3.21 -ARG BUILDX_VERSION=0.17.1 +# BUILDX_VERSION sets the version of buildx to install in the dev container. +# It must be a valid tag in the docker.io/docker/buildx-bin image repository +# on Docker Hub. +ARG BUILDX_VERSION=0.20.1 FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang