JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #861 from tonistiigi/disable-gc 

integration: disable gc
docker-19.03
Tõnis Tiigi 2019-03-17 18:01:29 -07:00 committed by GitHub
parent 6bc2b827c0 aece2ac1aa
commit 0c747f4276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
util/testutil/integration/containerd.go
View File

@ -123,6 +123,7 @@ disabled_plugins = ["cri"]
buildkitdArgs := []string{"buildkitd", buildkitdArgs := []string{"buildkitd",
"--oci-worker=false", "--oci-worker=false",
"--containerd-worker-gc=false",
"--containerd-worker=true", "--containerd-worker=true",
"--containerd-worker-addr", address, "--containerd-worker-addr", address,
"--containerd-worker-labels=org.mobyproject.buildkit.worker.sandbox=true", // Include use of --containerd-worker-labels to trigger https://github.com/moby/buildkit/pull/603 "--containerd-worker-labels=org.mobyproject.buildkit.worker.sandbox=true", // Include use of --containerd-worker-labels to trigger https://github.com/moby/buildkit/pull/603

2
util/testutil/integration/oci.go
View File

@ -60,7 +60,7 @@ func (s *oci) New(opt ...SandboxOpt) (Sandbox, func() error, error) {
} }
logs := map[string]*bytes.Buffer{} logs := map[string]*bytes.Buffer{}
// Include use of --oci-worker-labels to trigger https://github.com/moby/buildkit/pull/603 // Include use of --oci-worker-labels to trigger https://github.com/moby/buildkit/pull/603
buildkitdArgs := []string{"buildkitd", "--oci-worker=true", "--containerd-worker=false", "--oci-worker-labels=org.mobyproject.buildkit.worker.sandbox=true"} buildkitdArgs := []string{"buildkitd", "--oci-worker=true", "--containerd-worker=false", "--oci-worker-gc=false", "--oci-worker-labels=org.mobyproject.buildkit.worker.sandbox=true"}
deferF := &multiCloser{} deferF := &multiCloser{}