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

Merge pull request #693 from tonistiigi/containerd-debug-sock 

testutil: use different containerd debug sock
docker-18.09 v0.3.1
Akihiro Suda 2018-10-17 12:57:35 +09:00 committed by GitHub
parent 6a3e7dd030 88c81ee6d5
commit 867bcd343f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,11 +96,12 @@ disabled_plugins = ["cri"]
[debug] [debug]
level = "debug" level = "debug"
address = %q
[plugins] [plugins]
[plugins.linux] [plugins.linux]
shim = %q shim = %q
`, filepath.Join(tmpdir, "root"), filepath.Join(tmpdir, "state"), address, c.containerdShim) `, filepath.Join(tmpdir, "root"), filepath.Join(tmpdir, "state"), address, filepath.Join(tmpdir, "debug.sock"), c.containerdShim)
configFile := filepath.Join(tmpdir, "config.toml") configFile := filepath.Join(tmpdir, "config.toml")
if err := ioutil.WriteFile(configFile, []byte(config), 0644); err != nil { if err := ioutil.WriteFile(configFile, []byte(config), 0644); err != nil {
return nil, nil, err return nil, nil, err