alextab93/buildx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source 
Dockerfile: update compose to 5.1.0
This commit is contained in:
CrazyMax
2026-03-06 11:21:11 +01:00
committed by GitHub
parent 6574d1bafa 5478703490
commit 7e865417cd
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1 -1
View File
@@ -12,7 +12,7 @@ ARG DOCKER_CLI_VERSION=${DOCKER_VERSION}
ARG GOTESTSUM_VERSION=v1.13.0 ARG GOTESTSUM_VERSION=v1.13.0
ARG REGISTRY_VERSION=3.0.0 ARG REGISTRY_VERSION=3.0.0
ARG BUILDKIT_VERSION=v0.27.1 ARG BUILDKIT_VERSION=v0.27.1
ARG COMPOSE_VERSION=v2.39.1 ARG COMPOSE_VERSION=v5.1.0
ARG UNDOCK_VERSION=0.9.0 ARG UNDOCK_VERSION=0.9.0
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
tests/integration.go
+4 -2
View File
@@ -83,13 +83,15 @@ func composeCmd(sb integration.Sandbox, opts ...cmdOpt) *exec.Cmd {
opt(cmd) opt(cmd)
} }
if builder := sb.Address(); builder != "" { builder := sb.Address()
context := sb.DockerAddress()
if builder != "" && builder != context {
cmd.Env = append(cmd.Env, cmd.Env = append(cmd.Env,
"BUILDX_CONFIG="+buildxConfig(sb), "BUILDX_CONFIG="+buildxConfig(sb),
"BUILDX_BUILDER="+builder, "BUILDX_BUILDER="+builder,
) )
} }
if context := sb.DockerAddress(); context != "" { if context != "" {
cmd.Env = append(cmd.Env, "DOCKER_CONTEXT="+context) cmd.Env = append(cmd.Env, "DOCKER_CONTEXT="+context)
} }
if v := os.Getenv("GO_TEST_COVERPROFILE"); v != "" { if v := os.Getenv("GO_TEST_COVERPROFILE"); v != "" {