From c365c3cc8a03ea891824ea717c60bfae39472ed0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 Jul 2024 02:42:47 +0200 Subject: [PATCH 1/2] Dockerfile: update buildx to v0.16.1 This is the version used in the dev-container, and for testing. release notes: https://github.com/docker/buildx/releases/tag/v0.16.1 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit d00e1abf550903933a887f2bbd31e94b05fd1787) 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 875984e5a3..a465fc2444 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG GO_VERSION=1.21.12 ARG XX_VERSION=1.4.0 ARG GOVERSIONINFO_VERSION=v1.3.0 ARG GOTESTSUM_VERSION=v1.10.0 -ARG BUILDX_VERSION=0.15.1 +ARG BUILDX_VERSION=0.16.1 ARG COMPOSE_VERSION=v2.28.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 365c5e4216..30e5057819 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -3,7 +3,7 @@ ARG GO_VERSION=1.21.12 ARG ALPINE_VERSION=3.20 -ARG BUILDX_VERSION=0.15.1 +ARG BUILDX_VERSION=0.16.1 FROM docker/buildx-bin:${BUILDX_VERSION} AS buildx FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang From 259d5e0f571ce8e6a6cc3d97ad336cdc4c0d7ce0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 Jul 2024 02:44:06 +0200 Subject: [PATCH 2/2] Dockerfile: update compose to v2.29.0 This is the version used in the dev-container, and for testing. release notes: https://github.com/docker/compose/releases/tag/v2.29.0 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 77c0d836024185f81362092677ae3a2b7b44e82a) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a465fc2444..46d0076236 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ARG XX_VERSION=1.4.0 ARG GOVERSIONINFO_VERSION=v1.3.0 ARG GOTESTSUM_VERSION=v1.10.0 ARG BUILDX_VERSION=0.16.1 -ARG COMPOSE_VERSION=v2.28.0 +ARG COMPOSE_VERSION=v2.29.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx