Merge pull request #3950 from deitch/context-for-rebuilt

ensure passing context when creating builder runner
This commit is contained in:
Avi Deitcher 2023-10-06 12:20:04 +03:00 committed by GitHub
commit 6c3f3e8eb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -319,10 +319,10 @@ func (dr *dockerRunnerImpl) builderEnsureContainer(ctx context.Context, name, im
} }
if recreate { if recreate {
// create the builder // create the builder
args := []string{"container", "run", "-d", "--name", name, "--privileged", image, "--allow-insecure-entitlement", "network.host", "--addr", fmt.Sprintf("unix://%s", buildkitSocketPath), "--debug"} args := []string{"--context", dockerContext, "container", "run", "-d", "--name", name, "--privileged", image, "--allow-insecure-entitlement", "network.host", "--addr", fmt.Sprintf("unix://%s", buildkitSocketPath), "--debug"}
msg := fmt.Sprintf("creating builder container '%s' in context '%s'", name, dockerContext) msg := fmt.Sprintf("creating builder container '%s' in context '%s'", name, dockerContext)
fmt.Println(msg) fmt.Println(msg)
if err := dr.command(nil, io.Discard, io.Discard, args...); err != nil { if err := dr.command(nil, nil, nil, args...); err != nil {
return nil, err return nil, err
} }
} }