diff --git a/cmd/dockerd/config_experimental.go b/cmd/dockerd/config_experimental.go deleted file mode 100644 index 355a29e859..0000000000 --- a/cmd/dockerd/config_experimental.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "github.com/docker/docker/daemon/config" - "github.com/spf13/pflag" -) - -func attachExperimentalFlags(conf *config.Config, cmd *pflag.FlagSet) { -} diff --git a/cmd/dockerd/config_solaris.go b/cmd/dockerd/config_solaris.go index ed67064906..ec4be281eb 100644 --- a/cmd/dockerd/config_solaris.go +++ b/cmd/dockerd/config_solaris.go @@ -12,6 +12,4 @@ func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) { // Then install flags common to unix platforms installUnixConfigFlags(conf, flags) - - attachExperimentalFlags(conf, flags) } diff --git a/cmd/dockerd/config_unix.go b/cmd/dockerd/config_unix.go index b3bd741c95..a3b0e36a08 100644 --- a/cmd/dockerd/config_unix.go +++ b/cmd/dockerd/config_unix.go @@ -44,6 +44,4 @@ func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) { flags.Var(&conf.ShmSize, "default-shm-size", "Default shm size for containers") flags.BoolVar(&conf.NoNewPrivileges, "no-new-privileges", false, "Set no-new-privileges by default for new containers") flags.StringVar(&conf.IpcMode, "default-ipc-mode", config.DefaultIpcMode, `Default mode for containers ipc ("shareable" | "private")`) - - attachExperimentalFlags(conf, flags) } diff --git a/daemon/daemon_experimental.go b/daemon/daemon_experimental.go deleted file mode 100644 index fb0251d4af..0000000000 --- a/daemon/daemon_experimental.go +++ /dev/null @@ -1,7 +0,0 @@ -package daemon - -import "github.com/docker/docker/api/types/container" - -func (daemon *Daemon) verifyExperimentalContainerSettings(hostConfig *container.HostConfig, config *container.Config) ([]string, error) { - return nil, nil -} diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 1f9885d176..51ea7c774f 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -574,11 +574,6 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes. var warnings []string sysInfo := sysinfo.New(true) - warnings, err := daemon.verifyExperimentalContainerSettings(hostConfig, config) - if err != nil { - return warnings, err - } - w, err := verifyContainerResources(&hostConfig.Resources, sysInfo, update) // no matter err is nil or not, w could have data in itself.