From b7efbc3059afd633c7be60d83df6ec322eb30c9f Mon Sep 17 00:00:00 2001 From: Fabrizio Steiner Date: Tue, 24 Jan 2017 21:41:32 +0100 Subject: [PATCH 1/2] Set minimum required API Version of docker to 1.24, this basically means we require at least docker 1.12.x or newer, therefore we also support docker 1.13.x. --- README.md | 1 - main.go | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 0657e26..b92958e 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,6 @@ docker run --rm v2tec/watchtower --help * `--no-pull` Do not pull new images. When this flag is specified, watchtower will not attempt to pull new images from the registry. Instead it will only monitor the local image cache for changes. Use this option if you are building new images directly on the Docker host without pushing them to a registry. * `--cleanup` Remove old images after updating. When this flag is specified, watchtower will remove the old image after restarting a container with a new image. Use this option to prevent the accumulation of orphaned images on your system as containers are updated. * `--tlsverify` Use TLS when connecting to the Docker socket and verify the server's certificate. -* `--apiversion` Specify the minimum docker api version. watchtower will only communicate with docker servers running this api version or later. * `--debug` Enable debug mode. When this option is specified you'll see more verbose logging in the watchtower log file. * `--help` Show documentation about the supported flags. diff --git a/main.go b/main.go index 3323d60..0ae3416 100644 --- a/main.go +++ b/main.go @@ -16,6 +16,10 @@ import ( "github.com/v2tec/watchtower/container" ) +// DockerAPIMinVersion is the version of the docker API, which is minimally required by +// watchtower. Currently we require at least API 1.24 and therefore Docker 1.12 or later. +const DockerAPIMinVersion string = "1.24" + var ( client container.Client scheduleSpec string @@ -75,11 +79,6 @@ func main() { Name: "debug", Usage: "enable debug mode with verbose logging", }, - cli.StringFlag{ - Name: "apiversion", - Usage: "the version of the docker api", - EnvVar: "DOCKER_API_VERSION", - }, } if err := app.Run(os.Args); err != nil { @@ -190,7 +189,7 @@ func envConfig(c *cli.Context) error { err = setEnvOptStr("DOCKER_HOST", c.GlobalString("host")) err = setEnvOptBool("DOCKER_TLS_VERIFY", c.GlobalBool("tlsverify")) - err = setEnvOptStr("DOCKER_API_VERSION", c.GlobalString("apiversion")) + err = setEnvOptStr("DOCKER_API_VERSION", DockerAPIMinVersion) return err } From 208678872ecebd58da41aaa739a357659daf9f4b Mon Sep 17 00:00:00 2001 From: Fabrizio Steiner Date: Tue, 24 Jan 2017 21:56:27 +0100 Subject: [PATCH 2/2] Fixed package path. --- glide.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glide.yaml b/glide.yaml index 18be0e1..8478cfa 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/stffabi/watchtower +package: github.com/v2tec/watchtower import: - package: github.com/Sirupsen/logrus version: ~0.11.x