Use separate exec-root for test daemons
Fixes #21545
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 0d9b94c4c5
)
This commit is contained in:
parent
8b0179c771
commit
073d7841b4
|
@ -144,6 +144,7 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {
|
||||||
d.Command,
|
d.Command,
|
||||||
"--containerd", "/var/run/docker/libcontainerd/docker-containerd.sock",
|
"--containerd", "/var/run/docker/libcontainerd/docker-containerd.sock",
|
||||||
"--graph", d.root,
|
"--graph", d.root,
|
||||||
|
"--exec-root", filepath.Join(d.folder, "exec-root"),
|
||||||
"--pidfile", fmt.Sprintf("%s/docker.pid", d.folder),
|
"--pidfile", fmt.Sprintf("%s/docker.pid", d.folder),
|
||||||
fmt.Sprintf("--userland-proxy=%t", d.userlandProxy),
|
fmt.Sprintf("--userland-proxy=%t", d.userlandProxy),
|
||||||
)
|
)
|
||||||
|
|
|
@ -210,7 +210,7 @@ func (r *remote) getLastEventTimestamp() int64 {
|
||||||
t := time.Now()
|
t := time.Now()
|
||||||
|
|
||||||
fi, err := os.Stat(r.eventTsPath)
|
fi, err := os.Stat(r.eventTsPath)
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) || fi.Size() == 0 {
|
||||||
return t.Unix()
|
return t.Unix()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue