From f1e3ed0c4899818e2305eb55ec2f952331c89cde Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 18 Apr 2025 12:41:06 +0200 Subject: [PATCH 1/4] Dockerfile: don't pin syntax to 1.7 The syntax was pinned for 1.7 in f696e0d2a7203c20e96466e10584202e2d50ab02 possibly because it was not yet promoted as "latest stable" at the time. I don't think we need to pin to an old version, and just go with the latest, so that we can use the latest features provided. Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 805304e565..a3c712ef18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.7 +# syntax=docker/dockerfile:1 ARG GO_VERSION=1.23.8 ARG BASE_DEBIAN_DISTRO="bookworm" From dd36139b1aff79a13a8888c3ffedebe785106c54 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 18 Apr 2025 12:43:11 +0200 Subject: [PATCH 2/4] Dockerfile: update cli to v28.1.1 Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a3c712ef18..56bd916847 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG XX_VERSION=1.6.1 ARG VPNKIT_VERSION=0.5.0 # DOCKERCLI_VERSION is the version of the CLI to install in the dev-container. -ARG DOCKERCLI_VERSION=v28.0.1 +ARG DOCKERCLI_VERSION=v28.1.1 ARG DOCKERCLI_REPOSITORY="https://github.com/docker/cli.git" # cli version used for integration-cli tests From a75be33ba002ab622255a0b224043ecc43cc6591 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 18 Apr 2025 12:44:25 +0200 Subject: [PATCH 3/4] Dockerfile: update buildx to v0.23.0 Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 56bd916847..5fe8458560 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,9 @@ ARG DOCKERCLI_REPOSITORY="https://github.com/docker/cli.git" # cli version used for integration-cli tests ARG DOCKERCLI_INTEGRATION_REPOSITORY="https://github.com/docker/cli.git" ARG DOCKERCLI_INTEGRATION_VERSION=v18.06.3-ce + # BUILDX_VERSION is the version of buildx to install in the dev container. -ARG BUILDX_VERSION=0.20.1 +ARG BUILDX_VERSION=0.23.0 ARG COMPOSE_VERSION=v2.33.1 ARG SYSTEMD="false" From 2808e59f4c6c4d3964246b7fa4d3530f14e11a95 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 18 Apr 2025 12:45:15 +0200 Subject: [PATCH 4/4] Dockerfile: update compose to v2.35.1 Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5fe8458560..c3b0a57328 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,9 @@ ARG DOCKERCLI_INTEGRATION_VERSION=v18.06.3-ce # BUILDX_VERSION is the version of buildx to install in the dev container. ARG BUILDX_VERSION=0.23.0 -ARG COMPOSE_VERSION=v2.33.1 + +# COMPOSE_VERSION is the version of compose to install in the dev container. +ARG COMPOSE_VERSION=v2.35.1 ARG SYSTEMD="false" ARG FIREWALLD="false"