remove unwanted changes from merge delta

This commit is contained in:
Simon Aronsson 2019-04-04 20:35:19 +02:00
parent 385b6db472
commit ec98f52182
13 changed files with 144 additions and 295 deletions

18
main.go
View file

@ -1,4 +1,4 @@
package main // import "github.com/kopfkrieg/watchtower"
package main // import "github.com/containrrr/watchtower"
import (
"os"
@ -8,12 +8,12 @@ import (
"strconv"
"github.com/kopfkrieg/watchtower/actions"
"github.com/kopfkrieg/watchtower/container"
"github.com/kopfkrieg/watchtower/notifications"
"github.com/robfig/cron"
log "github.com/sirupsen/logrus"
"github.com/urfave/cli"
"github.com/containrrr/watchtower/actions"
"github.com/containrrr/watchtower/container"
"github.com/containrrr/watchtower/notifications"
)
// DockerAPIMinVersion is the version of the docker API, which is minimally required by
@ -31,7 +31,7 @@ var (
noRestart bool
enableLabel bool
notifier *notifications.Notifier
timeout time.Duration
timeout time.Duration
)
func init() {
@ -84,10 +84,10 @@ func main() {
EnvVar: "DOCKER_TLS_VERIFY",
},
cli.DurationFlag{
Name: "stop-timeout",
Usage: "timeout before container is forcefully stopped",
Value: time.Second * 10,
EnvVar: "WATCHTOWER_TIMEOUT",
Name: "stop-timeout",
Usage: "timeout before container is forcefully stopped",
Value: time.Second * 10,
EnvVar: "WATCHTOWER_TIMEOUT",
},
cli.BoolFlag{
Name: "label-enable",