df2a989769
This fixes a panic when an admin specifies a custom default runtime,
when a plugin is started the shim config is nil.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 2903863a1d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
23 lines
764 B
Go
23 lines
764 B
Go
// +build !windows
|
|
|
|
package daemon // import "github.com/docker/docker/daemon"
|
|
|
|
import (
|
|
"github.com/docker/docker/container"
|
|
)
|
|
|
|
// getLibcontainerdCreateOptions callers must hold a lock on the container
|
|
func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Container) (string, interface{}, error) {
|
|
// Ensure a runtime has been assigned to this container
|
|
if container.HostConfig.Runtime == "" {
|
|
container.HostConfig.Runtime = daemon.configStore.GetDefaultRuntimeName()
|
|
container.CheckpointTo(daemon.containersReplica)
|
|
}
|
|
|
|
rt, err := daemon.getRuntime(container.HostConfig.Runtime)
|
|
if err != nil {
|
|
return "", nil, translateContainerdStartErr(container.Path, container.SetExitCode, err)
|
|
}
|
|
|
|
return rt.Shim.Binary, rt.Shim.Opts, nil
|
|
}
|