+
+
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
diff --git a/cmd/root.go b/cmd/root.go
index 453196a..63a824c 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -1,6 +1,7 @@
package cmd
import (
+ "github.com/containrrr/watchtower/pkg/filters"
"os"
"os/signal"
"strconv"
@@ -108,7 +109,7 @@ func PreRun(cmd *cobra.Command, args []string) {
// Run is the main execution flow of the command
func Run(c *cobra.Command, names []string) {
- filter := container.BuildFilter(names, enableLabel)
+ filter := filters.BuildFilter(names, enableLabel)
runOnce, _ := c.PersistentFlags().GetBool("run-once")
if runOnce {
@@ -155,7 +156,7 @@ func runUpgradesOnSchedule(filter t.Filter) error {
return err
}
- log.Debug("Starting Watchtower and scheduling first run: " + cron.Entries()[0].Schedule.Next(time.Now()).String())
+ log.Info("Starting Watchtower and scheduling first run: " + cron.Entries()[0].Schedule.Next(time.Now()).String())
cron.Start()
// Graceful shut-down on SIGINT/SIGTERM
@@ -172,7 +173,7 @@ func runUpgradesOnSchedule(filter t.Filter) error {
func runUpdatesWithNotifications(filter t.Filter) {
notifier.StartNotification()
- updateParams := actions.UpdateParams{
+ updateParams := t.UpdateParams{
Filter: filter,
Cleanup: cleanup,
NoRestart: noRestart,
diff --git a/Dockerfile b/dockerfiles/Dockerfile
similarity index 85%
rename from Dockerfile
rename to dockerfiles/Dockerfile
index 75f70f2..f792d32 100644
--- a/Dockerfile
+++ b/dockerfiles/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9 as alpine
+FROM alpine:3.11 as alpine
RUN apk add --no-cache \
ca-certificates \
@@ -15,4 +15,4 @@ COPY --from=alpine \
/usr/share/zoneinfo
COPY watchtower /
-ENTRYPOINT ["/watchtower"]
\ No newline at end of file
+ENTRYPOINT ["/watchtower"]
diff --git a/dockerfiles/Dockerfile.dev-self-contained b/dockerfiles/Dockerfile.dev-self-contained
new file mode 100644
index 0000000..307ffbe
--- /dev/null
+++ b/dockerfiles/Dockerfile.dev-self-contained
@@ -0,0 +1,38 @@
+#
+# Builder
+#
+
+FROM golang:alpine as builder
+
+# use version (for example "v0.3.3") or "master"
+ARG WATCHTOWER_VERSION=master
+
+RUN apk add --no-cache \
+ alpine-sdk \
+ ca-certificates \
+ git \
+ tzdata
+
+COPY . /watchtower
+
+RUN \
+ cd /watchtower && \
+ \
+ GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' . && \
+ GO111MODULE=on go test ./... -v
+
+
+#
+# watchtower
+#
+
+FROM scratch
+
+LABEL "com.centurylinklabs.watchtower"="true"
+
+# copy files from other container
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
+COPY --from=builder /watchtower/watchtower /watchtower
+
+ENTRYPOINT ["/watchtower"]
diff --git a/Dockerfile.self-contained b/dockerfiles/Dockerfile.self-contained
similarity index 100%
rename from Dockerfile.self-contained
rename to dockerfiles/Dockerfile.self-contained
diff --git a/docs/credential-helpers.md b/docs/credential-helpers.md
deleted file mode 100644
index 1722906..0000000
--- a/docs/credential-helpers.md
+++ /dev/null
@@ -1,64 +0,0 @@
-Some private docker registries (the most prominent probably being AWS ECR) use non-standard ways of authentication.
-To be able to use this together with watchtower, we need to use a credential helper.
-
-To keep the image size small we've decided to not include any helpers in the watchtower image, instead we'll put the
-helper in a separate container and mount it using volumes.
-
-### Example
-Example implementation for use with [amazon-ecr-credential-helper](https://github.com/awslabs/amazon-ecr-credential-helper):
-
-```Dockerfile
-FROM golang:latest
-
-ENV CGO_ENABLED 0
-ENV REPO github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login
-
-RUN go get -u $REPO
-
-RUN rm /go/bin/docker-credential-ecr-login
-
-RUN go build \
- -o /go/bin/docker-credential-ecr-login \
- /go/src/$REPO
-
-WORKDIR /go/bin/
-```
-
-and the docker-compose definition:
-```yaml
-version: "3"
-
-services:
- watchtower:
- image: index.docker.io/containrrr/watchtower:latest
- volumes:
- - /var/run/docker.sock:/var/run/docker.sock
- - 
