kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #27953 from thaJeztah/fix-deprecation-version 

Update deprecation versions for "email" and colon in "security options"
This commit is contained in:
Michael Crosby 2016-11-01 14:31:32 -07:00 committed by GitHub
parent 22f3e43e9a e41a39dbae
commit 74bdacb908
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/command/registry/login.go
View File

@ -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
}

2
daemon/daemon_unix.go
View File

@ -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 {