Merge pull request #3699 from tonistiigi/dockerfile-compose-v5.1.0

crazy-max · web-flow · commit 7e865417cdbc · 2026-03-06T11:21:11.000+01:00
Dockerfile: update compose to 5.1.0
diff --git 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
diff --git 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 != "" {

Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,15 @@ func composeCmd(sb integration.Sandbox, opts ...cmdOpt) *exec.Cmd {`
`83`	`83`	`opt(cmd)`
`84`	`84`	`}`
`85`	`85`
`86`		`- if builder := sb.Address(); builder != "" {`
	`86`	`+ builder := sb.Address()`
	`87`	`+ context := sb.DockerAddress()`
	`88`	`+ if builder != "" && builder != context {`
`87`	`89`	`cmd.Env = append(cmd.Env,`
`88`	`90`	`"BUILDX_CONFIG="+buildxConfig(sb),`
`89`	`91`	`"BUILDX_BUILDER="+builder,`
`90`	`92`	`)`
`91`	`93`	`}`
`92`		`- if context := sb.DockerAddress(); context != "" {`
	`94`	`+ if context != "" {`
`93`	`95`	`cmd.Env = append(cmd.Env, "DOCKER_CONTEXT="+context)`
`94`	`96`	`}`
`95`	`97`	`if v := os.Getenv("GO_TEST_COVERPROFILE"); v != "" {`