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

testutil: use different containerd debug sock
2018-10-17 12:57:35 +09:00 · 2018-10-17 12:57:35 +09:00 · 867bcd343f
parent 6a3e7dd030 88c81ee6d5
commit 867bcd343f
1 changed files with 2 additions and 1 deletions
--- a/util/testutil/integration/containerd.go
+++ b/util/testutil/integration/containerd.go
@ -96,11 +96,12 @@ disabled_plugins = ["cri"]

 [debug]
  level = "debug"
+  address = %q

 [plugins]
  [plugins.linux]
    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")
 	if err := ioutil.WriteFile(configFile, []byte(config), 0644); err != nil {
 		return nil, nil, err