Merge pull request #397 from docker/fix-logout

Fix logout
docker-archive · Jul 17, 2020 · 45604a6 · 45604a6
2 parents 0bf09d3 + d1a929e
commit 45604a6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/cli/cmd/logout/azurelogout.go → cli/cmd/logout/azure.go b/cli/cmd/logout/azurelogout.go → cli/cmd/logout/azure.go
diff --git a/cli/cmd/logout/logout.go b/cli/cmd/logout/logout.go
@@ -12,7 +12,7 @@ func Command() *cobra.Command {
 		Use:   "logout [SERVER]",
 		Short: "Log out from a Docker registry or cloud backend",
 		Long:  "Log out from a Docker registry or cloud backend.\nIf no server is specified, the default is defined by the daemon.",
-		Args:  cobra.MaximumNArgs(0),
+		Args:  cobra.MaximumNArgs(1),
 		RunE:  runLogout,
 	}
 

diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
@@ -133,6 +133,9 @@ func (s *E2eSuite) TestClassicLogin() {
 	output, err := s.NewDockerCommand("login", "someregistry.docker.io").Exec()
 	Expect(output).To(ContainSubstring("Cannot perform an interactive login from a non TTY device"))
 	Expect(err).NotTo(BeNil())
+	output, err = s.NewDockerCommand("logout", "someregistry.docker.io").Exec()
+	Expect(output).To(ContainSubstring("Removing login credentials for someregistry.docker.io"))
+	Expect(err).To(BeNil())
 }
 
 func (s *E2eSuite) TestCloudLogin() {