From 45c9dcc779b9e87af722b61e996533adb6a09b35 Mon Sep 17 00:00:00 2001 From: Alexander Voronin Date: Sat, 2 May 2020 21:29:44 +0300 Subject: [PATCH] Increases stopContainer timeout to 10min (#528) That means the update timeout until now has been 1 second, as that's the sleep duration of the timeout checker. This commit changes it to 10 actual minutes. --- internal/actions/check.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/actions/check.go b/internal/actions/check.go index dec9f60..c6d5c12 100644 --- a/internal/actions/check.go +++ b/internal/actions/check.go @@ -3,12 +3,13 @@ package actions import ( "errors" "fmt" - "github.com/containrrr/watchtower/pkg/filters" - "github.com/containrrr/watchtower/pkg/sorter" "sort" "strings" "time" + "github.com/containrrr/watchtower/pkg/filters" + "github.com/containrrr/watchtower/pkg/sorter" + "github.com/opencontainers/runc/Godeps/_workspace/src/github.com/Sirupsen/logrus" log "github.com/sirupsen/logrus" @@ -45,7 +46,7 @@ func cleanupExcessWatchtowers(containers []container.Container, client container allContainersExceptLast := containers[0 : len(containers)-1] for _, c := range allContainersExceptLast { - if err := client.StopContainer(c, 600); err != nil { + if err := client.StopContainer(c, 10*time.Minute); err != nil { // logging the original here as we're just returning a count logrus.Error(err) stopErrors++