Merge pull request #1588 from ndeloof/prefer_cli_plugin

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

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)
 	}