Merge pull request #30106 from runcom/fix-upgrade-from-1.10

daemon: honor default runtime when starting containers
This commit is contained in:
Michael Crosby 2017-01-12 14:44:37 -08:00 committed by GitHub
commit f65212d5b9

View file

@ -14,7 +14,7 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
// Ensure a runtime has been assigned to this container
if container.HostConfig.Runtime == "" {
container.HostConfig.Runtime = stockRuntimeName
container.HostConfig.Runtime = daemon.configStore.GetDefaultRuntimeName()
container.ToDisk()
}