@@ -35,9 +35,14 @@ func NewLoginCommand(dockerCli *command.DockerCli) *cobra.Command {

 	}

 	flags := cmd.Flags()

+

 	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

 }

@@ -28,3 +28,17 @@ 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)

+}

@@ -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", loginReg.URL())

+	s.d.Cmd("login", "-u", "richard", "-p", "testtest", "-e", "testuser@testdomain.com", loginReg.URL())

 	regexpCheckUA(c, loginUA)

 	s.d.Cmd("pull", pullRepoName)

@@ -203,6 +203,11 @@ func (r *V2) Password() string {

 	return r.password

 }

+// Email returns the configured email of the server

+func (r *V2) Email() string {

+	return r.email

+}

+

 // Path returns the path where the registry write data

 func (r *V2) Path() string {

 	return filepath.Join(r.dir, "docker", "registry", "v2")