From e41a39dbae007b04e12504e75ef69fb1ae6ab7c9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 1 Nov 2016 09:12:27 -0700 Subject: [PATCH] Update deprecation versions for "email" and colon in "security options" These features were originally scheduled for removal in docker 1.13, but we changed our deprecation policy to keep features for three releases instead of two. This updates the deprecation version to match the deprecation policy. Signed-off-by: Sebastiaan van Stijn --- cli/command/registry/login.go | 4 ++-- daemon/daemon_unix.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/command/registry/login.go b/cli/command/registry/login.go index 7b29cfdb29..93e1b40e36 100644 --- a/cli/command/registry/login.go +++ b/cli/command/registry/login.go @@ -39,9 +39,9 @@ func NewLoginCommand(dockerCli *command.DockerCli) *cobra.Command { flags.StringVarP(&opts.user, "username", "u", "", "Username") flags.StringVarP(&opts.password, "password", "p", "", "Password") - // Deprecated in 1.11: Should be removed in docker 1.13 + // Deprecated in 1.11: Should be removed in docker 1.14 flags.StringVarP(&opts.email, "email", "e", "", "Email") - flags.MarkDeprecated("email", "will be removed in 1.13.") + flags.MarkDeprecated("email", "will be removed in 1.14.") return cmd } diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index d04c67173b..f250663b02 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -168,7 +168,7 @@ func parseSecurityOpt(container *container.Container, config *containertypes.Hos con = strings.SplitN(opt, "=", 2) } else if strings.Contains(opt, ":") { con = strings.SplitN(opt, ":", 2) - logrus.Warn("Security options with `:` as a separator are deprecated and will be completely unsupported in 1.13, use `=` instead.") + logrus.Warn("Security options with `:` as a separator are deprecated and will be completely unsupported in 1.14, use `=` instead.") } if len(con) != 2 {