From 50fa436c213156a261ab0c2de6efc128b004ed58 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 13 Jul 2025 17:43:50 +0200 Subject: [PATCH 1/2] Dockerfile: update compose to v2.38.2 Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f5213cbf18..3914870e49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,11 @@ ARG GOTESTSUM_VERSION=v1.12.0 # It must be a tag in the docker.io/docker/buildx-bin image repository # on Docker Hub. ARG BUILDX_VERSION=0.24.0 -ARG COMPOSE_VERSION=v2.36.2 + +# COMPOSE_VERSION is the version of compose to install in the dev container. +# It must be a tag in the docker.io/docker/compose-bin image repository +# on Docker Hub. +ARG COMPOSE_VERSION=v2.38.2 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx From e6b8cc1c7db42fcd1d4cd1c75c43b9f1d3ca2293 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 13 Jul 2025 17:45:07 +0200 Subject: [PATCH 2/2] Dockerfile: update buildx to v0.25.0 Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- dockerfiles/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3914870e49..ff7d2f1c27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG GOTESTSUM_VERSION=v1.12.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.24.0 +ARG BUILDX_VERSION=0.25.0 # COMPOSE_VERSION is the version of compose to install in the dev container. # It must be a tag in the docker.io/docker/compose-bin image repository diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 4067f16de8..67fc1f6477 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -6,7 +6,7 @@ ARG ALPINE_VERSION=3.21 # 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.24.0 +ARG BUILDX_VERSION=0.25.0 FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang