From b6f1f3a9bf407efbce95bbb24738f08058d68c8b Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Thu, 5 Mar 2026 15:41:04 -0800 Subject: [PATCH 1/2] Dockerfile: update compose to 5.1.0 Fixes the possible "file already closed" error. Signed-off-by: Tonis Tiigi --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ef7d73fe5c3f..b4ce40a0880a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG DOCKER_CLI_VERSION=${DOCKER_VERSION} ARG GOTESTSUM_VERSION=v1.13.0 ARG REGISTRY_VERSION=3.0.0 ARG BUILDKIT_VERSION=v0.27.1 -ARG COMPOSE_VERSION=v2.39.1 +ARG COMPOSE_VERSION=v5.1.0 ARG UNDOCK_VERSION=0.9.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx From 54787034906b1c993a725c6d1d983766db27481a Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Thu, 5 Mar 2026 17:58:56 -0800 Subject: [PATCH 2/2] tests: test updates after compose update Signed-off-by: Tonis Tiigi --- tests/integration.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/integration.go b/tests/integration.go index 7035ff001bcf..91edb178a5cf 100644 --- a/tests/integration.go +++ b/tests/integration.go @@ -83,13 +83,15 @@ func composeCmd(sb integration.Sandbox, opts ...cmdOpt) *exec.Cmd { opt(cmd) } - if builder := sb.Address(); builder != "" { + builder := sb.Address() + context := sb.DockerAddress() + if builder != "" && builder != context { cmd.Env = append(cmd.Env, "BUILDX_CONFIG="+buildxConfig(sb), "BUILDX_BUILDER="+builder, ) } - if context := sb.DockerAddress(); context != "" { + if context != "" { cmd.Env = append(cmd.Env, "DOCKER_CONTEXT="+context) } if v := os.Getenv("GO_TEST_COVERPROFILE"); v != "" {