tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-08 22:34:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8788 from debdutdeb/8784-timeout-param

Browse Source 
Fix compose down --timeout/-t flag
This commit is contained in:
Mathieu Champlon 2021-10-19 05:43:45 +02:00 committed by GitHub
commit 555b0ab0da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/compose/down.go
View File

@ -43,10 +43,8 @@ func downCommand(p *projectOptions, backend api.Service) *cobra.Command {
downCmd := &cobra.Command{ downCmd := &cobra.Command{
Use: "down", Use: "down",
Short: "Stop and remove containers, networks", Short: "Stop and remove containers, networks",
PreRun: func(cmd *cobra.Command, args []string) { PreRunE: AdaptCmd(func(ctx context.Context, cmd *cobra.Command, args []string) error {
opts.timeChanged = cmd.Flags().Changed("timeout") opts.timeChanged = cmd.Flags().Changed("timeout")
},
PreRunE: Adapt(func(ctx context.Context, args []string) error {
if opts.images != "" { if opts.images != "" {
if opts.images != "all" && opts.images != "local" { if opts.images != "all" && opts.images != "local" {
return fmt.Errorf("invalid value for --rmi: %q", opts.images) return fmt.Errorf("invalid value for --rmi: %q", opts.images)

4
cmd/compose/up.go
View File

@ -98,10 +98,8 @@ func upCommand(p *projectOptions, backend api.Service) *cobra.Command {
upCmd := &cobra.Command{ upCmd := &cobra.Command{
Use: "up [SERVICE...]", Use: "up [SERVICE...]",
Short: "Create and start containers", Short: "Create and start containers",
PreRun: func(cmd *cobra.Command, args []string) { PreRunE: AdaptCmd(func(ctx context.Context, cmd *cobra.Command, args []string) error {
create.timeChanged = cmd.Flags().Changed("timeout") create.timeChanged = cmd.Flags().Changed("timeout")
},
PreRunE: Adapt(func(ctx context.Context, args []string) error {
if up.exitCodeFrom != "" { if up.exitCodeFrom != "" {
up.cascadeStop = true up.cascadeStop = true
} }