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

Merge pull request #23772 from mlaventure/fix-missing-runtime-on-upgrade

Browse Source 
Fix missing container runtime on upgrade
Upstream-commit: f8656a6e37ded7d1558b4003c7a527861cd3aef6
Component: engine
This commit is contained in:
Vincent Demeester
2016-06-21 12:22:28 +02:00
committed by GitHub
parent d20da36e24 f5f0a01144
commit f29a5ef358
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/engine/daemon/start_linux.go
View File

@ -5,14 +5,21 @@ import (
"github.com/docker/docker/container"
"github.com/docker/docker/libcontainerd"
"github.com/docker/engine-api/types"
)
func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Container) (*[]libcontainerd.CreateOption, error) {
createOptions := []libcontainerd.CreateOption{}
// Ensure a runtime has been assigned to this container
if container.HostConfig.Runtime == "" {
container.HostConfig.Runtime = types.DefaultRuntimeName
container.ToDisk()
}
rt := daemon.configStore.GetRuntime(container.HostConfig.Runtime)
if rt == nil {
return nil, fmt.Errorf("No such runtime '%s'", container.HostConfig.Runtime)
return nil, fmt.Errorf("no such runtime '%s'", container.HostConfig.Runtime)
}
createOptions = append(createOptions, libcontainerd.WithRuntime(rt.Path, rt.Args))