diff --git a/cli/cmd/compose/exec.go b/cli/cmd/compose/exec.go index a57bed76..b37a6e22 100644 --- a/cli/cmd/compose/exec.go +++ b/cli/cmd/compose/exec.go @@ -68,7 +68,7 @@ func execCommand(p *projectOptions, backend compose.Service) *cobra.Command { runCmd.Flags().IntVar(&opts.index, "index", 1, "index of the container if there are multiple instances of a service [default: 1].") runCmd.Flags().BoolVarP(&opts.privileged, "privileged", "", false, "Give extended privileges to the process.") runCmd.Flags().StringVarP(&opts.user, "user", "u", "", "Run the command as this user.") - runCmd.Flags().BoolVarP(&opts.noTty, "", "T", false, "Disable pseudo-TTY allocation. By default `docker compose exec` allocates a TTY.") + runCmd.Flags().BoolVarP(&opts.noTty, "", "T", notAtTTY(), "Disable pseudo-TTY allocation. By default `docker compose exec` allocates a TTY.") runCmd.Flags().StringVarP(&opts.workingDir, "workdir", "w", "", "Path to workdir directory for this command.") runCmd.Flags().SetInterspersed(false) diff --git a/cli/cmd/compose/run.go b/cli/cmd/compose/run.go index be10a41f..6504d5c7 100644 --- a/cli/cmd/compose/run.go +++ b/cli/cmd/compose/run.go @@ -24,6 +24,7 @@ import ( "github.com/compose-spec/compose-go/loader" "github.com/compose-spec/compose-go/types" + "github.com/mattn/go-isatty" "github.com/mattn/go-shellwords" "github.com/spf13/cobra" @@ -132,7 +133,7 @@ func runCommand(p *projectOptions, backend compose.Service) *cobra.Command { flags.StringArrayVarP(&opts.environment, "env", "e", []string{}, "Set environment variables") flags.StringArrayVarP(&opts.labels, "labels", "l", []string{}, "Add or override a label") flags.BoolVar(&opts.Remove, "rm", false, "Automatically remove the container when it exits") - flags.BoolVarP(&opts.noTty, "no-TTY", "T", false, "Disable pseudo-noTty allocation. By default docker compose run allocates a TTY") + flags.BoolVarP(&opts.noTty, "no-TTY", "T", notAtTTY(), "Disable pseudo-noTty allocation. By default docker compose run allocates a TTY") flags.StringVar(&opts.name, "name", "", " Assign a name to the container") flags.StringVarP(&opts.user, "user", "u", "", "Run as specified username or uid") flags.StringVarP(&opts.workdir, "workdir", "w", "", "Working directory inside the container") @@ -147,6 +148,10 @@ func runCommand(p *projectOptions, backend compose.Service) *cobra.Command { return cmd } +func notAtTTY() bool { + return !isatty.IsTerminal(os.Stdout.Fd()) +} + func runRun(ctx context.Context, backend compose.Service, project *types.Project, opts runOptions) error { err := opts.apply(project) if err != nil {