diff --git a/cmd/dockerd/config.go b/cmd/dockerd/config.go index c375f4b0d4..be332626ae 100644 --- a/cmd/dockerd/config.go +++ b/cmd/dockerd/config.go @@ -62,9 +62,6 @@ func installCommonConfigFlags(conf *config.Config, flags *pflag.FlagSet) error { // Deprecated flags / options - //nolint:staticcheck // TODO(thaJeztah): remove in next release. - flags.StringVarP(&conf.RootDeprecated, "graph", "g", conf.RootDeprecated, "Root of the Docker runtime") - _ = flags.MarkDeprecated("graph", "Use --data-root instead") flags.BoolVarP(&conf.AutoRestart, "restart", "r", true, "--restart on the daemon has been deprecated in favor of --restart policies on docker run") _ = flags.MarkDeprecated("restart", "Please use a restart policy on docker run") diff --git a/daemon/config/config.go b/daemon/config/config.go index 9a2ee9e63b..acc2411f15 100644 --- a/daemon/config/config.go +++ b/daemon/config/config.go @@ -159,7 +159,6 @@ type CommonConfig struct { NetworkDiagnosticPort int `json:"network-diagnostic-port,omitempty"` Pidfile string `json:"pidfile,omitempty"` RawLogs bool `json:"raw-logs,omitempty"` - RootDeprecated string `json:"graph,omitempty"` // Deprecated: use Root instead. TODO(thaJeztah): remove in next release. Root string `json:"data-root,omitempty"` ExecRoot string `json:"exec-root,omitempty"` SocketGroup string `json:"group,omitempty"` @@ -558,11 +557,6 @@ func findConfigurationConflicts(config map[string]interface{}, flags *pflag.Flag // such as config.DNS, config.Labels, config.DNSSearch, // as well as config.MaxConcurrentDownloads, config.MaxConcurrentUploads and config.MaxDownloadAttempts. func Validate(config *Config) error { - //nolint:staticcheck // TODO(thaJeztah): remove in next release. - if config.RootDeprecated != "" { - return errors.New(`the "graph" config file option is deprecated; use "data-root" instead`) - } - // validate log-level if config.LogLevel != "" { if _, err := logrus.ParseLevel(config.LogLevel); err != nil {