From 1af533909d2e1aa97b1b8046c3a72da98880a669 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 1 Jun 2017 12:55:04 +0200 Subject: [PATCH 1/2] Remove deprecated -e/--email flag from docker login The `docker login -e` / `docker login --email` option was deprecated in Docker 1.11 (https://github.com/moby/moby/releases/tag/v1.11.0) through aee260d4eb3aa0fc86ee5038010b7bbc24512ae5 (April 2016), and when used has been outputing a deprecation warning since; Flag --email has been deprecated, will be removed in 17.06. Originally this option was scheduled to be removed in docker 1.13, but extended to docker 17.06 due to a change in our deprecation policy. Given that only docker 1.10 and older use this flag (which is EOL, including for CS versions, as of February 2017), will now be removed. With this patch, `docker login` will now produce an Error if the flag is used. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 8b383d23514293bd0accc0dab9e8289142a3bb5a) Signed-off-by: Eli Uriegas --- components/cli/cli/command/registry/login.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/cli/cli/command/registry/login.go b/components/cli/cli/command/registry/login.go index aa508a6a8d3..af79e967cc0 100644 --- a/components/cli/cli/command/registry/login.go +++ b/components/cli/cli/command/registry/login.go @@ -41,10 +41,6 @@ func NewLoginCommand(dockerCli command.Cli) *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 17.06 - flags.StringVarP(&opts.email, "email", "e", "", "Email") - flags.MarkDeprecated("email", "will be removed in 17.06.") - return cmd } From 8c2c3e21a3941a000830a00fc3ad1f3541839a4c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 12 Jun 2017 13:25:26 +0200 Subject: [PATCH 2/2] Remove "-e" / "--email" from integration tests This option is no longer supported in docker 17.06, so should not be used. Signed-off-by: Sebastiaan van Stijn --- .../integration-cli/docker_cli_login_test.go | 14 -------------- .../docker_cli_registry_user_agent_test.go | 2 +- .../integration-cli/docker_cli_v2_only_test.go | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_login_test.go b/components/engine/integration-cli/docker_cli_login_test.go index f805035769f..94dc03778fa 100644 --- a/components/engine/integration-cli/docker_cli_login_test.go +++ b/components/engine/integration-cli/docker_cli_login_test.go @@ -28,17 +28,3 @@ func (s *DockerRegistryAuthHtpasswdSuite) TestLoginToPrivateRegistry(c *check.C) // now it's fine dockerCmd(c, "login", "-u", s.reg.Username(), "-p", s.reg.Password(), privateRegistryURL) } - -func (s *DockerRegistryAuthHtpasswdSuite) TestLoginToPrivateRegistryDeprecatedEmailFlag(c *check.C) { - // Test to make sure login still works with the deprecated -e and --email flags - // wrong credentials - out, _, err := dockerCmdWithError("login", "-u", s.reg.Username(), "-p", "WRONGPASSWORD", "-e", s.reg.Email(), privateRegistryURL) - c.Assert(err, checker.NotNil, check.Commentf(out)) - c.Assert(out, checker.Contains, "401 Unauthorized") - - // now it's fine - // -e flag - dockerCmd(c, "login", "-u", s.reg.Username(), "-p", s.reg.Password(), "-e", s.reg.Email(), privateRegistryURL) - // --email flag - dockerCmd(c, "login", "-u", s.reg.Username(), "-p", s.reg.Password(), "--email", s.reg.Email(), privateRegistryURL) -} diff --git a/components/engine/integration-cli/docker_cli_registry_user_agent_test.go b/components/engine/integration-cli/docker_cli_registry_user_agent_test.go index 5e1c00aa8ab..406fb7c2ee6 100644 --- a/components/engine/integration-cli/docker_cli_registry_user_agent_test.go +++ b/components/engine/integration-cli/docker_cli_registry_user_agent_test.go @@ -107,7 +107,7 @@ func (s *DockerRegistrySuite) TestUserAgentPassThrough(c *check.C) { s.d.Cmd("build", "--file", dockerfileName, ".") regexpCheckUA(c, buildUA) - s.d.Cmd("login", "-u", "richard", "-p", "testtest", "-e", "testuser@testdomain.com", loginReg.URL()) + s.d.Cmd("login", "-u", "richard", "-p", "testtest", loginReg.URL()) regexpCheckUA(c, loginUA) s.d.Cmd("pull", pullRepoName) diff --git a/components/engine/integration-cli/docker_cli_v2_only_test.go b/components/engine/integration-cli/docker_cli_v2_only_test.go index 77974c4ef45..348c2e9c270 100644 --- a/components/engine/integration-cli/docker_cli_v2_only_test.go +++ b/components/engine/integration-cli/docker_cli_v2_only_test.go @@ -60,7 +60,7 @@ func (s *DockerRegistrySuite) TestV2Only(c *check.C) { s.d.Cmd("build", "--file", dockerfileName, ".") s.d.Cmd("run", repoName) - s.d.Cmd("login", "-u", "richard", "-p", "testtest", "-e", "testuser@testdomain.com", reg.URL()) + s.d.Cmd("login", "-u", "richard", "-p", "testtest", reg.URL()) s.d.Cmd("tag", "busybox", repoName) s.d.Cmd("push", repoName) s.d.Cmd("pull", repoName)