Ken Cochrane
2919d69a0c
This removes the email prompt when you use docker login, and also removes the ability to register via the docker cli. Docker login, will strictly be used for logging into a registry server. Signed-off-by: Ken Cochrane <kencochrane@gmail.com> Upstream-commit: aee260d4eb3aa0fc86ee5038010b7bbc24512ae5 Component: engine
45 lines
1.6 KiB
Go
45 lines
1.6 KiB
Go
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"os/exec"
|
|
|
|
"github.com/docker/docker/pkg/integration/checker"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func (s *DockerSuite) TestLoginWithoutTTY(c *check.C) {
|
|
cmd := exec.Command(dockerBinary, "login")
|
|
|
|
// Send to stdin so the process does not get the TTY
|
|
cmd.Stdin = bytes.NewBufferString("buffer test string \n")
|
|
|
|
// run the command and block until it's done
|
|
err := cmd.Run()
|
|
c.Assert(err, checker.NotNil) //"Expected non nil err when loginning in & TTY not available"
|
|
}
|
|
|
|
func (s *DockerRegistryAuthSuite) TestLoginToPrivateRegistry(c *check.C) {
|
|
// wrong credentials
|
|
out, _, err := dockerCmdWithError("login", "-u", s.reg.username, "-p", "WRONGPASSWORD", privateRegistryURL)
|
|
c.Assert(err, checker.NotNil, check.Commentf(out))
|
|
c.Assert(out, checker.Contains, "401 Unauthorized")
|
|
|
|
// now it's fine
|
|
dockerCmd(c, "login", "-u", s.reg.username, "-p", s.reg.password, privateRegistryURL)
|
|
}
|
|
|
|
func (s *DockerRegistryAuthSuite) 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)
|
|
}
|