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

Merge pull request #471 from docker/fix-run-timeout

Browse Source 
Put 40 seconds for timeout instead of 20
This commit is contained in:
Djordje Lukic 2020-08-13 10:44:37 +02:00 committed by GitHub
commit 4286458300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/main.go
View File

@ -226,7 +226,7 @@ func checkIfUnknownCommandExistInDefaultContext(err error, currentContext string
func newSigContext() (context.Context, func()) { func newSigContext() (context.Context, func()) {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
s := make(chan os.Signal) s := make(chan os.Signal, 1)
signal.Notify(s, syscall.SIGTERM, syscall.SIGINT) signal.Notify(s, syscall.SIGTERM, syscall.SIGINT)
go func() { go func() {
<-s <-s

2
cli/mobycli/exec.go
View File

@ -62,7 +62,7 @@ func Exec() {
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
signals := make(chan os.Signal) signals := make(chan os.Signal, 1)
childExit := make(chan bool) childExit := make(chan bool)
signal.Notify(signals) // catch all signals signal.Notify(signals) // catch all signals
go func() { go func() {

2
tests/e2e/e2e_test.go
View File

@ -299,7 +299,7 @@ func TestLegacy(t *testing.T) {
t.Run("local run", func(t *testing.T) { t.Run("local run", func(t *testing.T) {
t.Parallel() t.Parallel()
cmd := c.NewDockerCmd("run", "--rm", "hello-world") cmd := c.NewDockerCmd("run", "--rm", "hello-world")
cmd.Timeout = 20 * time.Second cmd.Timeout = 40 * time.Second
res := icmd.RunCmd(cmd) res := icmd.RunCmd(cmd)
res.Assert(t, icmd.Expected{Out: "Hello from Docker!"}) res.Assert(t, icmd.Expected{Out: "Hello from Docker!"})
}) })