read compose.yaml file too

Author: lionello

src/cmd/cli/color.go

@@ -0,0 +1,38 @@
+package main
+
+import "fmt"
+
+type ColorMode string
+
+const (
+	// ColorNone disables color output.
+	ColorNone ColorMode = "none"
+	// ColorAuto enables color output only if the output is connected to a terminal.
+	ColorAuto ColorMode = "auto"
+	// ColorAlways enables color output.
+	ColorAlways ColorMode = "always"
+)
+
+var allColorModes = []ColorMode{
+	ColorNone,
+	ColorAuto,
+	ColorAlways,
+}
+
+func (c ColorMode) String() string {
+	return string(c)
+}
+
+func (c *ColorMode) Set(value string) error {
+	for _, colorMode := range allColorModes {
+		if colorMode.String() == value {
+			*c = colorMode
+			return nil
+		}
+	}
+	return fmt.Errorf("color mode not one of %v", allColorModes)
+}
+
+func (c ColorMode) Type() string {
+	return "color-mode"
+}

src/cmd/cli/main.go

@@ -63,16 +63,16 @@ var rootCmd = &cobra.Command{
 			}
 		}
 
-		color, _ := cmd.Flags().GetString("color")
-		switch color {
-		case "auto":
+		color := cmd.Flag("color").Value.(*ColorMode)
+		switch *color {
+		case ColorAuto:
 			cli.DoColor = cli.CanColor
-		case "always":
+		case ColorAlways:
 			cli.DoColor = true
-		case "never":
+		case ColorNone:
 			cli.DoColor = false
 		default:
-			return fmt.Errorf("invalid color option: %s", color)
+			panic("invalid color mode")
 		}
 
 		if _, _, err := net.SplitHostPort(server); err != nil {
@@ -575,7 +575,8 @@ var logoutCmd = &cobra.Command{
 }
 
 func main() {
-	rootCmd.PersistentFlags().String("color", "auto", `Colorize output; "auto", "always" or "never"`)
+	colorMode := ColorAuto
+	rootCmd.PersistentFlags().Var(&colorMode, "color", `Colorize output; "auto", "always" or "never"`)
 	rootCmd.PersistentFlags().StringVarP(&server, "cluster", "s", defFabric, "Cluster to connect to")
 	rootCmd.PersistentFlags().BoolVarP(&cli.DoVerbose, "verbose", "v", false, "Verbose logging")
 	rootCmd.PersistentFlags().BoolVar(&cli.DoDryRun, "dry-run", false, "Dry run (don't actually change anything)")
@@ -623,7 +624,7 @@ func main() {
 	rootCmd.AddCommand(secretsCmd)
 
 	// Compose Command
-	composeCmd.PersistentFlags().StringP("file", "f", "docker-compose.yml", "Compose file path")
+	composeCmd.PersistentFlags().StringP("file", "f", "*compose.y*ml", `Compose file path`)
 	composeCmd.MarkPersistentFlagFilename("file", "yml", "yaml")
 	// composeCmd.Flags().Bool("compatibility", false, "Run compose in backward compatibility mode"); TODO: Implement compose option
 	// composeCmd.Flags().String("env-file", "", "Specify an alternate environment file."); TODO: Implement compose option
@@ -684,7 +685,7 @@ func main() {
 		var derr *cli.ComposeError
 		if errors.As(err, &derr) {
 			compose := "compose"
-			composeFile := composeCmd.PersistentFlags().Lookup("file")
+			composeFile := composeCmd.Flag("file")
 			if composeFile.Changed {
 				compose += " -f " + composeFile.Value.String()
 			}

src/pkg/cli/compose.go

@@ -95,6 +95,13 @@ func convertPlatform(platform string) pb.Platform {
 }
 
 func loadDockerCompose(filePath, projectName string) (*types.Project, error) {
+	// The default path for a Compose file is compose.yaml (preferred) or compose.yml that is placed in the working directory.
+	// Compose also supports docker-compose.yaml and docker-compose.yml for backwards compatibility.
+	if files, _ := filepath.Glob(filePath); len(files) > 1 {
+		return nil, fmt.Errorf("multiple Compose files found: %q; use -f to specify which one to use", files)
+	} else if len(files) == 1 {
+		filePath = files[0]
+	}
 	Debug(" - Loading compose file", filePath, "for project", projectName)
 	// Compose-go uses the logrus logger, so we need to configure it to be more like our own logger
 	logrus.SetFormatter(&logrus.TextFormatter{DisableTimestamp: true, DisableColors: !DoColor, DisableLevelTruncation: true})