docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 00:47:48 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

tests: set a dedicated buildx config dir for each worker

Browse Source 
This should help reduce any unexpected config conflict between workers.

Signed-off-by: Justin Chadwell <me@jedevc.com>
(cherry picked from commit 6f394a06919a5271f7423e9778889841a6550832)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Justin Chadwell 2023-06-20 12:40:41 +01:00 committed by Sebastiaan van Stijn
parent d21e9fa8c6
commit 6faf7e5688
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/integration.go
View File

@ -47,6 +47,7 @@ func buildxCmd(sb integration.Sandbox, opts ...cmdOpt) *exec.Cmd {
if builder := sb.Address(); builder != "" { if builder := sb.Address(); builder != "" {
cmd.Args = append(cmd.Args, "--builder="+builder) cmd.Args = append(cmd.Args, "--builder="+builder)
cmd.Env = append(cmd.Env, "BUILDX_CONFIG=/tmp/buildx-"+builder)
} }
if context := sb.DockerAddress(); context != "" { if context := sb.DockerAddress(); context != "" {
cmd.Env = append(cmd.Env, "DOCKER_CONTEXT="+context) cmd.Env = append(cmd.Env, "DOCKER_CONTEXT="+context)

6
tests/workers/docker-container.go
View File

@ -50,7 +50,11 @@ func (w *containerWorker) New(ctx context.Context, cfg *integration.BackendConfi
"--driver=docker-container", "--driver=docker-container",
"--driver-opt=network=host", "--driver-opt=network=host",
) )
cmd.Env = append(os.Environ(), "DOCKER_CONTEXT="+w.docker.DockerAddress()) cmd.Env = append(
os.Environ(),
"BUILDX_CONFIG=/tmp/buildx-"+name,
"DOCKER_CONTEXT="+w.docker.DockerAddress(),
)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return nil, nil, errors.Wrapf(err, "failed to create buildx instance %s", name) return nil, nil, errors.Wrapf(err, "failed to create buildx instance %s", name)
} }

2
tests/workers/docker.go
View File

@ -2,6 +2,7 @@ package workers
import ( import (
"context" "context"
"os"
"os/exec" "os/exec"
"github.com/moby/buildkit/identity" "github.com/moby/buildkit/identity"
@ -41,6 +42,7 @@ func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
name, name,
"--docker", "host="+bk.DockerAddress(), "--docker", "host="+bk.DockerAddress(),
) )
cmd.Env = append(os.Environ(), "BUILDX_CONFIG=/tmp/buildx-"+name)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return bk, cl, errors.Wrapf(err, "failed to create buildx instance %s", name) return bk, cl, errors.Wrapf(err, "failed to create buildx instance %s", name)
} }

2
tests/workers/remote.go
View File

@ -2,6 +2,7 @@ package workers
import ( import (
"context" "context"
"os"
"os/exec" "os/exec"
"github.com/moby/buildkit/identity" "github.com/moby/buildkit/identity"
@ -41,6 +42,7 @@ func (w remoteWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
"--driver=remote", "--driver=remote",
bk.Address(), bk.Address(),
) )
cmd.Env = append(os.Environ(), "BUILDX_CONFIG=/tmp/buildx-"+name)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return nil, nil, errors.Wrapf(err, "failed to create buildx instance %s", name) return nil, nil, errors.Wrapf(err, "failed to create buildx instance %s", name)
} }