remove log flag

Signed-off-by: Mark Jagyo <[email protected]>

Author: mjagyo

cmd/compose/up.go

@@ -58,7 +58,6 @@ type upOptions struct {
 	noAttach              []string
 	timestamp             bool
 	wait                  bool
-	log                   bool
 	waitTimeout           int
 	watch                 bool
 	navigationMenu        bool
@@ -172,7 +171,6 @@ func upCommand(p *ProjectOptions, dockerCli command.Cli, backendOptions *Backend
 	flags.StringArrayVar(&up.noAttach, "no-attach", []string{}, "Do not attach (stream logs) to the specified services")
 	flags.BoolVar(&up.attachDependencies, "attach-dependencies", false, "Automatically attach to log output of dependent services")
 	flags.BoolVar(&up.wait, "wait", false, "Wait for services to be running|healthy. Implies attached mode by default.")
-	flags.BoolVar(&up.log, "log", false, "Stream service logs")
 	flags.IntVar(&up.waitTimeout, "wait-timeout", 0, "Maximum duration in seconds to wait for the project to be running|healthy")
 	flags.BoolVarP(&up.watch, "watch", "w", false, "Watch source code and rebuild/refresh containers when files are updated.")
 	flags.BoolVar(&up.navigationMenu, "menu", false, "Enable interactive shortcuts when running attached. Incompatible with --detach. Can also be enable/disable by setting COMPOSE_MENU environment var.")
@@ -197,12 +195,6 @@ func validateFlags(up *upOptions, create *createOptions) error {
 		return fmt.Errorf("--abort-on-container-failure cannot be combined with --abort-on-container-exit")
 	}
 
-	if up.log {
-		if !up.wait {
-			return fmt.Errorf("--log should be combined with --wait")
-		}
-	}
-
 	if up.wait {
 		up.Detach = false
 		if up.attachDependencies || up.cascadeStop || len(up.attach) > 0 {
@@ -348,7 +340,6 @@ func runUp(
 			OnExit:         upOptions.OnExit(),
 			Wait:           upOptions.wait,
 			WaitTimeout:    timeout,
-			Log:            upOptions.log,
 			Watch:          upOptions.watch,
 			Services:       services,
 			NavigationMenu: upOptions.navigationMenu && display.Mode != "plain" && dockerCli.In().IsTerminal(),

cmd/compose/wait.go

@@ -60,7 +60,6 @@ func waitCommand(p *ProjectOptions, dockerCli command.Cli, backendOptions *Backe
 	}
 
 	cmd.Flags().BoolVar(&opts.downProject, "down-project", false, "Drops project when the first container stops")
-	cmd.Flags().BoolVar(&opts.log, "log", false, "Shows the logs of the service")
 
 	return cmd
 }
@@ -81,7 +80,6 @@ func runWait(ctx context.Context, dockerCli command.Cli, backendOptions *Backend
 		Services:                   opts.services,
 		DownProjectOnContainerExit: opts.downProject,
 		Consumer:                   consumer,
-		Log:                        opts.log,
 		Project:                    project,
 	})
 }

pkg/api/api.go

@@ -165,7 +165,6 @@ type WaitOptions struct {
 	Services []string
 	// Executes a down when a container exits
 	DownProjectOnContainerExit bool
-	Log                        bool
 	Project                    *types.Project
 	Consumer                   LogConsumer
 }
@@ -296,7 +295,6 @@ type StartOptions struct {
 	ExitCodeFrom string
 	// Wait won't return until containers reached the running|healthy state
 	Wait        bool
-	Log         bool
 	WaitTimeout time.Duration
 	// Services passed in the command line to be started
 	Services       []string

pkg/compose/up.go

@@ -198,10 +198,11 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
 	}
 	monitor.withListener(printer.HandleEvent)
 
-	monitor.withListener(onHealthy(func(e api.ContainerEvent) {
-		fmt.Println("Healthy:", e.Service, e.Container.Name)
-		cancel()
-	}))
+	if options.Start.Wait {
+		monitor.withListener(onHealthy(func(e api.ContainerEvent) {
+			cancel()
+		}))
+	}
 
 	var exitCode int
 	if options.Start.OnExit != api.CascadeIgnore {

pkg/compose/wait.go

@@ -42,13 +42,11 @@ func (s *composeService) Wait(
 	eg, waitCtx := errgroup.WithContext(ctx)
 	var statusCode int64
 
-	if options.Log {
-		s.Logs(ctx, projectName, options.Consumer, api.LogOptions{
-			Project:  options.Project,
-			Services: options.Services,
-			Follow:   false,
-		})
-	}
+	s.Logs(ctx, projectName, options.Consumer, api.LogOptions{
+		Project:  options.Project,
+		Services: options.Services,
+		Follow:   false,
+	})
 
 	for _, ctr := range containers {
 		eg.Go(func() error {