p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #24450 from runcom/fix-systemd-defaultRuntime

Browse Source 
daemon: ensure we set default options to stock runtime
Upstream-commit: 9d10221a1c433799fa07672ef9fcdebb8d99698f
Component: engine
This commit is contained in:
Alexander Morozov
2016-07-08 08:52:18 -07:00
committed by GitHub
parent bab1299e0a bff94672e9
commit 3d5be41442
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/daemon/daemon_unix.go
View File

@ -579,7 +579,11 @@ func verifyDaemonSettings(config *Config) error {
if config.Runtimes == nil {
config.Runtimes = make(map[string]types.Runtime)
}
config.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary}
stockRuntimeOpts := []string{}
if UsingSystemd(config) {
stockRuntimeOpts = append(stockRuntimeOpts, "--systemd-cgroup=true")
}
config.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary, Args: stockRuntimeOpts}
return nil
}