Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2017/12/19 01:07:48... | ... |
@@ -44,6 +44,4 @@ func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) { |
44 | 44 |
flags.Var(&conf.ShmSize, "default-shm-size", "Default shm size for containers") |
45 | 45 |
flags.BoolVar(&conf.NoNewPrivileges, "no-new-privileges", false, "Set no-new-privileges by default for new containers") |
46 | 46 |
flags.StringVar(&conf.IpcMode, "default-ipc-mode", config.DefaultIpcMode, `Default mode for containers ipc ("shareable" | "private")`) |
47 |
- |
|
48 |
- attachExperimentalFlags(conf, flags) |
|
49 | 47 |
} |
50 | 48 |
deleted file mode 100644 |
... | ... |
@@ -1,7 +0,0 @@ |
1 |
-package daemon |
|
2 |
- |
|
3 |
-import "github.com/docker/docker/api/types/container" |
|
4 |
- |
|
5 |
-func (daemon *Daemon) verifyExperimentalContainerSettings(hostConfig *container.HostConfig, config *container.Config) ([]string, error) { |
|
6 |
- return nil, nil |
|
7 |
-} |
... | ... |
@@ -574,11 +574,6 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes. |
574 | 574 |
var warnings []string |
575 | 575 |
sysInfo := sysinfo.New(true) |
576 | 576 |
|
577 |
- warnings, err := daemon.verifyExperimentalContainerSettings(hostConfig, config) |
|
578 |
- if err != nil { |
|
579 |
- return warnings, err |
|
580 |
- } |
|
581 |
- |
|
582 | 577 |
w, err := verifyContainerResources(&hostConfig.Resources, sysInfo, update) |
583 | 578 |
|
584 | 579 |
// no matter err is nil or not, w could have data in itself. |