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

Use "docker-runc" as alias for the default runtime

Browse Source 
This also moves the variable holding the default runtime name from the
engine-api repository into docker repository

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 69af7d0d13670b8e2a03a38b4d9a849fc109b338
Component: engine
This commit is contained in:
Kenfe-Mickael Laventure
2016-06-20 12:14:27 -07:00
parent eee2bc634c
commit 40dd500778
8 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/engine/runconfig/opts/runtime.go
View File

@ -9,16 +9,17 @@ import (
// RuntimeOpt defines a map of Runtimes
type RuntimeOpt struct {
name string
values *map[string]types.Runtime
name string
stockRuntimeName string
values *map[string]types.Runtime
}
// NewNamedRuntimeOpt creates a new RuntimeOpt
func NewNamedRuntimeOpt(name string, ref *map[string]types.Runtime) *RuntimeOpt {
func NewNamedRuntimeOpt(name string, ref *map[string]types.Runtime, stockRuntime string) *RuntimeOpt {
if ref == nil {
ref = &map[string]types.Runtime{}
}
return &RuntimeOpt{name: name, values: ref}
return &RuntimeOpt{name: name, values: ref, stockRuntimeName: stockRuntime}
}
// Name returns the name of the NamedListOpts in the configuration.
@ -40,8 +41,8 @@ func (o *RuntimeOpt) Set(val string) error {
}
parts[0] = strings.ToLower(parts[0])
if parts[0] == types.DefaultRuntimeName {
return fmt.Errorf("runtime name 'default' is reserved")
if parts[0] == o.stockRuntimeName {
return fmt.Errorf("runtime name '%s' is reserved", o.stockRuntimeName)
}
if _, ok := (*o.values)[parts[0]]; ok {