From 32da9e65e8a588d60cf8a8007a42fc403696f6f1 Mon Sep 17 00:00:00 2001
From: Djordje Lukic <djordje.lukic@docker.com>
Date: Sun, 26 Apr 2020 22:13:35 +0200
Subject: [PATCH] Only execute moby if the command is not a context command

---
 cli/main.go | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/cli/main.go b/cli/main.go
index 16d019f3d..c7f6bcaf4 100644
--- a/cli/main.go
+++ b/cli/main.go
@@ -60,13 +60,25 @@ func init() {
 	}
 }
 
+func isContextCommand(cmd *cobra.Command) bool {
+	if cmd == nil {
+		return false
+	}
+	if cmd.Name() == "context" {
+		return true
+	}
+	return isContextCommand(cmd.Parent())
+}
+
 func main() {
 	var opts mainOpts
 	root := &cobra.Command{
 		Use:  "docker",
 		Long: "docker for the 2020s",
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			execMoby(cmd.Context())
+			if !isContextCommand(cmd) {
+				execMoby(cmd.Context())
+			}
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -76,7 +88,9 @@ func main() {
 
 	helpFunc := root.HelpFunc()
 	root.SetHelpFunc(func(cmd *cobra.Command, args []string) {
-		execMoby(cmd.Context())
+		if !isContextCommand(cmd) {
+			execMoby(cmd.Context())
+		}
 		helpFunc(cmd, args)
 	})
 
@@ -128,7 +142,9 @@ func withCurrentContext(ctx context.Context, opts mainOpts) (context.Context, er
 	if currentContext == "" {
 		currentContext = "default"
 	}
+
 	logrus.Debugf("Current context %q", currentContext)
+
 	return context.WithValue(ctx, currentContextKey{}, currentContext), nil
 }
 
@@ -146,6 +162,8 @@ func execMoby(ctx context.Context) {
 	if err != nil {
 		logrus.Fatal(err)
 	}
+	// Only run original docker command if the current context is not
+	// ours.
 	_, ok := cc.Metadata.(store.TypeContext)
 	if !ok {
 		cmd := exec.Command("docker", os.Args[1:]...)