Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-27 03:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #1303 from docker/down_timeout

Browse source 
introduce timeout flag on down and stop
This commit is contained in:
Nicolas De loof 2021-02-16 10:59:02 +01:00 • committed by GitHub
commit bd9248d074
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 126 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/client/compose.go
View file

@ -48,7 +48,7 @@ func (c *composeService) Start(ctx context.Context, project *types.Project, opti
return errdefs.ErrNotImplemented
}
func (c *composeService) Stop(ctx context.Context, project *types.Project) error {
func (c *composeService) Stop(ctx context.Context, project *types.Project, options compose.StopOptions) error {
return errdefs.ErrNotImplemented
}

11
api/compose/api.go
View file

@ -19,6 +19,7 @@ package compose
import (
"context"
"io"
"time"
"github.com/compose-spec/compose-go/types"
)
@ -36,7 +37,7 @@ type Service interface {
// Start executes the equivalent to a `compose start`
Start(ctx context.Context, project *types.Project, options StartOptions) error
// Stop executes the equivalent to a `compose stop`
Stop(ctx context.Context, project *types.Project) error
Stop(ctx context.Context, project *types.Project, options StopOptions) error
// Up executes the equivalent to a `compose up`
Up(ctx context.Context, project *types.Project, options UpOptions) error
// Down executes the equivalent to a `compose down`
@ -71,6 +72,12 @@ type StartOptions struct {
Attach ContainerEventListener
}
// StopOptions group options of the Stop API
type StopOptions struct {
// Timeout override container stop timeout
Timeout *time.Duration
}
// UpOptions group options of the Up API
type UpOptions struct {
// Detach will create services and return immediately
@ -83,6 +90,8 @@ type DownOptions struct {
RemoveOrphans bool
// Project is the compose project used to define this app. Might be nil if user ran `down` just with project name
Project *types.Project
// Timeout override container stop timeout
Timeout *time.Duration
}
// ConvertOptions group options of the Convert API