From fa8b911cd8c4633da501f8b839c9162da30c2898 Mon Sep 17 00:00:00 2001
From: Guillaume Tardif <guillaume.tardif@docker.com>
Date: Tue, 23 Jun 2020 15:13:43 +0200
Subject: [PATCH] Allow running `docker -v` or `--version` even if context is
 not default

---
 cli/main.go            | 4 ++++
 cli/options/options.go | 5 +++--
 tests/e2e/e2e_test.go  | 8 ++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/cli/main.go b/cli/main.go
index e20ac00ae..e72980419 100644
--- a/cli/main.go
+++ b/cli/main.go
@@ -124,6 +124,7 @@ func main() {
 	root.PersistentFlags().StringVarP(&opts.Host, "host", "H", "", "Daemon socket(s) to connect to")
 	opts.AddConfigFlags(root.PersistentFlags())
 	opts.AddContextFlags(root.PersistentFlags())
+	root.Flags().BoolVarP(&opts.Version, "version", "v", false, "Print version information and quit")
 
 	// populate the opts with the global flags
 	_ = root.PersistentFlags().Parse(os.Args[1:])
@@ -137,6 +138,9 @@ func main() {
 	if opts.Host != "" {
 		mobycli.ExecRegardlessContext(ctx)
 	}
+	if opts.Version {
+		mobycli.ExecRegardlessContext(ctx)
+	}
 
 	if opts.Config == "" {
 		fatal(errors.New("config path cannot be empty"))
diff --git a/cli/options/options.go b/cli/options/options.go
index 9496f8622..07879ec7d 100644
--- a/cli/options/options.go
+++ b/cli/options/options.go
@@ -25,6 +25,7 @@ import (
 type GlobalOpts struct {
 	apicontext.ContextFlags
 	cliconfig.ConfigFlags
-	Debug bool
-	Host  string
+	Debug   bool
+	Version bool
+	Host    string
 }
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
index 65030db1b..6e2aa9451 100644
--- a/tests/e2e/e2e_test.go
+++ b/tests/e2e/e2e_test.go
@@ -226,6 +226,14 @@ func defaultEndpoint() string {
 	return "unix:///var/run/docker.sock"
 }
 
+func (s *E2eSuite) TestExecMobyIfUsingversionFlag() {
+	s.NewDockerCommand("context", "create", "example", "test-example").ExecOrDie()
+	s.NewDockerCommand("context", "use", "test-example").ExecOrDie()
+	output, err := s.NewDockerCommand("-v").Exec()
+	Expect(err).To(BeNil())
+	Expect(output).To(ContainSubstring("Docker version"))
+}
+
 func (s *E2eSuite) TestDisplaysAdditionalLineInDockerVersion() {
 	output := s.NewDockerCommand("version").ExecOrDie()
 	Expect(output).To(ContainSubstring("Azure integration"))