On default context, "compose" is implemented by CLI Plugin

ndeloof · ndeloof · commit 9123c7514282 · 2021-04-23T12:06:14.000+02:00
Signed-off-by: Nicolas De Loof &lt;nicolas.deloof@gmail.com&gt;
diff --git a/cli/main.go b/cli/main.go
@@ -218,10 +218,14 @@ func main() {
 
 	root.AddCommand(
 		run.Command(ctype),
-		compose.RootCommand(ctype, service.ComposeService()),
 		volume.Command(ctype),
 	)
 
+	if ctype != store.DefaultContextType {
+		// On default context, "compose" is implemented by CLI Plugin
+		root.AddCommand(compose.RootCommand(ctype, service.ComposeService()))
+	}
+
 	if err = root.ExecuteContext(ctx); err != nil {
 		handleError(ctx, err, ctype, currentContext, cc, root)
 	}

Original file line number	Diff line number	Diff line change
`@@ -218,10 +218,14 @@ func main() {`
`218`	`218`
`219`	`219`	`root.AddCommand(`
`220`	`220`	`run.Command(ctype),`
`221`		`- compose.RootCommand(ctype, service.ComposeService()),`
`222`	`221`	`volume.Command(ctype),`
`223`	`222`	`)`
`224`	`223`
	`224`	`+ if ctype != store.DefaultContextType {`
	`225`	`+ // On default context, "compose" is implemented by CLI Plugin`
	`226`	`+ root.AddCommand(compose.RootCommand(ctype, service.ComposeService()))`
	`227`	`+ }`
	`228`	`+`
`225`	`229`	`if err = root.ExecuteContext(ctx); err != nil {`
`226`	`230`	`handleError(ctx, err, ctype, currentContext, cc, root)`
`227`	`231`	`}`