From 89dba8455bcfc983b2194ae707205193e8d1950e Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Mon, 8 Jul 2024 15:18:32 +0200 Subject: [PATCH] chore(go): rename --- .github/ISSUE_TEMPLATE/config.yml | 2 +- cmd/notify-upgrade.go | 6 +++--- cmd/root.go | 24 +++++++++++------------ code_of_conduct.md | 2 +- dockerfiles/Dockerfile.dev-self-contained | 2 +- dockerfiles/Dockerfile.self-contained | 4 ++-- docs/index.md | 12 ++++++------ internal/actions/actions_suite_test.go | 6 +++--- internal/actions/check.go | 8 ++++---- internal/actions/mocks/client.go | 2 +- internal/actions/mocks/container.go | 4 ++-- internal/actions/mocks/progress.go | 4 ++-- internal/actions/update.go | 12 ++++++------ internal/actions/update_test.go | 6 +++--- main.go | 2 +- mkdocs.yml | 2 +- pkg/api/metrics/metrics.go | 2 +- pkg/api/metrics/metrics_test.go | 6 +++--- pkg/container/cgroup_id.go | 2 +- pkg/container/client.go | 6 +++--- pkg/container/client_test.go | 8 ++++---- pkg/container/container.go | 4 ++-- pkg/container/container_test.go | 2 +- pkg/container/mocks/ApiServer.go | 2 +- pkg/container/mocks/container_ref.go | 2 +- pkg/container/util_test.go | 2 +- pkg/filters/filters.go | 2 +- pkg/filters/filters_test.go | 2 +- pkg/lifecycle/lifecycle.go | 4 ++-- pkg/metrics/metrics.go | 2 +- pkg/notifications/email.go | 2 +- pkg/notifications/gotify.go | 2 +- pkg/notifications/json.go | 2 +- pkg/notifications/json_test.go | 2 +- pkg/notifications/model.go | 2 +- pkg/notifications/msteams.go | 2 +- pkg/notifications/notifier.go | 2 +- pkg/notifications/notifier_test.go | 6 +++--- pkg/notifications/preview/data/data.go | 2 +- pkg/notifications/preview/data/report.go | 2 +- pkg/notifications/preview/data/status.go | 2 +- pkg/notifications/preview/tplprev.go | 4 ++-- pkg/notifications/shoutrrr.go | 4 ++-- pkg/notifications/shoutrrr_test.go | 6 +++--- pkg/notifications/slack.go | 2 +- pkg/registry/auth/auth.go | 4 ++-- pkg/registry/auth/auth_test.go | 6 +++--- pkg/registry/digest/digest.go | 8 ++++---- pkg/registry/digest/digest_test.go | 6 +++--- pkg/registry/helpers/helpers_test.go | 2 +- pkg/registry/manifest/manifest.go | 4 ++-- pkg/registry/manifest/manifest_test.go | 4 ++-- pkg/registry/registry.go | 4 ++-- pkg/registry/registry_test.go | 4 ++-- pkg/registry/trust.go | 4 ++-- pkg/session/container_status.go | 2 +- pkg/session/progress.go | 2 +- pkg/session/report.go | 2 +- pkg/sorter/sort.go | 2 +- tplprev/main.go | 6 +++--- tplprev/main_wasm.go | 6 +++--- 61 files changed, 126 insertions(+), 126 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 01cc777..09b00fa 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: false contact_links: - name: Ask a question - url: https://github.com/containrrr/watchtower/discussions + url: https://github.com/beatkind/watchtower/discussions about: Ask questions and discuss with other community members diff --git a/cmd/notify-upgrade.go b/cmd/notify-upgrade.go index 9991ee6..14625a5 100644 --- a/cmd/notify-upgrade.go +++ b/cmd/notify-upgrade.go @@ -9,9 +9,9 @@ import ( "syscall" "time" - "github.com/containrrr/watchtower/internal/flags" - "github.com/containrrr/watchtower/pkg/container" - "github.com/containrrr/watchtower/pkg/notifications" + "github.com/beatkind/watchtower/internal/flags" + "github.com/beatkind/watchtower/pkg/container" + "github.com/beatkind/watchtower/pkg/notifications" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index eef13ce..e0b9ee2 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -11,17 +11,17 @@ import ( "syscall" "time" - "github.com/containrrr/watchtower/internal/actions" - "github.com/containrrr/watchtower/internal/flags" - "github.com/containrrr/watchtower/internal/meta" - "github.com/containrrr/watchtower/pkg/api" - apiMetrics "github.com/containrrr/watchtower/pkg/api/metrics" - "github.com/containrrr/watchtower/pkg/api/update" - "github.com/containrrr/watchtower/pkg/container" - "github.com/containrrr/watchtower/pkg/filters" - "github.com/containrrr/watchtower/pkg/metrics" - "github.com/containrrr/watchtower/pkg/notifications" - t "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/actions" + "github.com/beatkind/watchtower/internal/flags" + "github.com/beatkind/watchtower/internal/meta" + "github.com/beatkind/watchtower/pkg/api" + apiMetrics "github.com/beatkind/watchtower/pkg/api/metrics" + "github.com/beatkind/watchtower/pkg/api/update" + "github.com/beatkind/watchtower/pkg/container" + "github.com/beatkind/watchtower/pkg/filters" + "github.com/beatkind/watchtower/pkg/metrics" + "github.com/beatkind/watchtower/pkg/notifications" + t "github.com/beatkind/watchtower/pkg/types" "github.com/robfig/cron" log "github.com/sirupsen/logrus" @@ -54,7 +54,7 @@ func NewRootCommand() *cobra.Command { Short: "Automatically updates running Docker containers", Long: ` Watchtower automatically updates running Docker containers whenever a new image is released. - More information available at https://github.com/containrrr/watchtower/. + More information available at https://github.com/beatkind/watchtower/. `, Run: Run, PreRun: PreRun, diff --git a/code_of_conduct.md b/code_of_conduct.md index 65d4355..ae04b6b 100644 --- a/code_of_conduct.md +++ b/code_of_conduct.md @@ -1,3 +1,3 @@ ### Containrrr Community Code of Conduct -Please refer to out [Containrrr Community Code of Conduct](https://github.com/containrrr/.github/blob/master/CODE_OF_CONDUCT.md) +Please refer to out [Containrrr Community Code of Conduct](https://github.com/beatkind/.github/blob/master/CODE_OF_CONDUCT.md) diff --git a/dockerfiles/Dockerfile.dev-self-contained b/dockerfiles/Dockerfile.dev-self-contained index 1a39c26..08433c0 100644 --- a/dockerfiles/Dockerfile.dev-self-contained +++ b/dockerfiles/Dockerfile.dev-self-contained @@ -25,7 +25,7 @@ COPY . /watchtower RUN \ cd /watchtower && \ \ - GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-extldflags '-static' -X github.com/containrrr/watchtower/internal/meta.Version=$(git describe --tags)" . && \ + GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-extldflags '-static' -X github.com/beatkind/watchtower/internal/meta.Version=$(git describe --tags)" . && \ GO111MODULE=on go test ./... -v diff --git a/dockerfiles/Dockerfile.self-contained b/dockerfiles/Dockerfile.self-contained index 04a6047..ed62341 100644 --- a/dockerfiles/Dockerfile.self-contained +++ b/dockerfiles/Dockerfile.self-contained @@ -13,12 +13,12 @@ RUN apk add --no-cache \ git \ tzdata -RUN git clone --branch "${WATCHTOWER_VERSION}" https://github.com/containrrr/watchtower.git +RUN git clone --branch "${WATCHTOWER_VERSION}" https://github.com/beatkind/watchtower.git RUN \ cd watchtower && \ \ - GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-extldflags '-static' -X github.com/containrrr/watchtower/internal/meta.Version=$(git describe --tags)" . && \ + GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-extldflags '-static' -X github.com/beatkind/watchtower/internal/meta.Version=$(git describe --tags)" . && \ GO111MODULE=on go test ./... -v diff --git a/docs/index.md b/docs/index.md index 1d0b2cc..55ac113 100644 --- a/docs/index.md +++ b/docs/index.md @@ -14,13 +14,13 @@ Codecov - - GoDoc + + GoDoc - - Go Report Card + + Go Report Card - + latest version @@ -29,7 +29,7 @@ Codacy Badge - + All Contributors diff --git a/internal/actions/actions_suite_test.go b/internal/actions/actions_suite_test.go index c320564..e4c4a07 100644 --- a/internal/actions/actions_suite_test.go +++ b/internal/actions/actions_suite_test.go @@ -6,10 +6,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/containrrr/watchtower/internal/actions" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/actions" + "github.com/beatkind/watchtower/pkg/types" - . "github.com/containrrr/watchtower/internal/actions/mocks" + . "github.com/beatkind/watchtower/internal/actions/mocks" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/internal/actions/check.go b/internal/actions/check.go index 77a2266..af46081 100644 --- a/internal/actions/check.go +++ b/internal/actions/check.go @@ -5,10 +5,10 @@ import ( "sort" "time" - "github.com/containrrr/watchtower/pkg/container" - "github.com/containrrr/watchtower/pkg/filters" - "github.com/containrrr/watchtower/pkg/sorter" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/container" + "github.com/beatkind/watchtower/pkg/filters" + "github.com/beatkind/watchtower/pkg/sorter" + "github.com/beatkind/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/internal/actions/mocks/client.go b/internal/actions/mocks/client.go index 737404a..6d5d6aa 100644 --- a/internal/actions/mocks/client.go +++ b/internal/actions/mocks/client.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" ) // MockClient is a mock that passes as a watchtower Client diff --git a/internal/actions/mocks/container.go b/internal/actions/mocks/container.go index e830587..afa30a4 100644 --- a/internal/actions/mocks/container.go +++ b/internal/actions/mocks/container.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/containrrr/watchtower/pkg/container" - wt "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/container" + wt "github.com/beatkind/watchtower/pkg/types" "github.com/docker/docker/api/types" dockerContainer "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" diff --git a/internal/actions/mocks/progress.go b/internal/actions/mocks/progress.go index 23fc441..ddfec84 100644 --- a/internal/actions/mocks/progress.go +++ b/internal/actions/mocks/progress.go @@ -3,8 +3,8 @@ package mocks import ( "errors" - "github.com/containrrr/watchtower/pkg/session" - wt "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/session" + wt "github.com/beatkind/watchtower/pkg/types" ) // CreateMockProgressReport creates a mock report from a given set of container states diff --git a/internal/actions/update.go b/internal/actions/update.go index 8853c6e..e3460a5 100644 --- a/internal/actions/update.go +++ b/internal/actions/update.go @@ -3,12 +3,12 @@ package actions import ( "errors" - "github.com/containrrr/watchtower/internal/util" - "github.com/containrrr/watchtower/pkg/container" - "github.com/containrrr/watchtower/pkg/lifecycle" - "github.com/containrrr/watchtower/pkg/session" - "github.com/containrrr/watchtower/pkg/sorter" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/util" + "github.com/beatkind/watchtower/pkg/container" + "github.com/beatkind/watchtower/pkg/lifecycle" + "github.com/beatkind/watchtower/pkg/session" + "github.com/beatkind/watchtower/pkg/sorter" + "github.com/beatkind/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/internal/actions/update_test.go b/internal/actions/update_test.go index 9209dcd..3123c94 100644 --- a/internal/actions/update_test.go +++ b/internal/actions/update_test.go @@ -3,13 +3,13 @@ package actions_test import ( "time" - "github.com/containrrr/watchtower/internal/actions" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/actions" + "github.com/beatkind/watchtower/pkg/types" dockerTypes "github.com/docker/docker/api/types" dockerContainer "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" - . "github.com/containrrr/watchtower/internal/actions/mocks" + . "github.com/beatkind/watchtower/internal/actions/mocks" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/main.go b/main.go index 9f8a012..34ab903 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/containrrr/watchtower/cmd" + "github.com/beatkind/watchtower/cmd" log "github.com/sirupsen/logrus" ) diff --git a/mkdocs.yml b/mkdocs.yml index 5227004..f6aa742 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,6 +1,6 @@ site_name: Watchtower site_url: https://containrrr.dev/watchtower/ -repo_url: https://github.com/containrrr/watchtower/ +repo_url: https://github.com/beatkind/watchtower/ edit_uri: edit/main/docs/ theme: name: 'material' diff --git a/pkg/api/metrics/metrics.go b/pkg/api/metrics/metrics.go index 4faad4a..876e118 100644 --- a/pkg/api/metrics/metrics.go +++ b/pkg/api/metrics/metrics.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/containrrr/watchtower/pkg/metrics" + "github.com/beatkind/watchtower/pkg/metrics" "net/http" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/pkg/api/metrics/metrics_test.go b/pkg/api/metrics/metrics_test.go index 48b6dd7..c82a33c 100644 --- a/pkg/api/metrics/metrics_test.go +++ b/pkg/api/metrics/metrics_test.go @@ -11,9 +11,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/containrrr/watchtower/pkg/api" - metricsAPI "github.com/containrrr/watchtower/pkg/api/metrics" - "github.com/containrrr/watchtower/pkg/metrics" + "github.com/beatkind/watchtower/pkg/api" + metricsAPI "github.com/beatkind/watchtower/pkg/api/metrics" + "github.com/beatkind/watchtower/pkg/metrics" ) const ( diff --git a/pkg/container/cgroup_id.go b/pkg/container/cgroup_id.go index 1da1dfe..2e690b4 100644 --- a/pkg/container/cgroup_id.go +++ b/pkg/container/cgroup_id.go @@ -5,7 +5,7 @@ import ( "os" "regexp" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) var dockerContainerPattern = regexp.MustCompile(`[0-9]+:.*:/docker/([a-f|0-9]{64})`) diff --git a/pkg/container/client.go b/pkg/container/client.go index c6c37de..21d9da7 100644 --- a/pkg/container/client.go +++ b/pkg/container/client.go @@ -15,9 +15,9 @@ import ( log "github.com/sirupsen/logrus" "golang.org/x/net/context" - "github.com/containrrr/watchtower/pkg/registry" - "github.com/containrrr/watchtower/pkg/registry/digest" - t "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/registry" + "github.com/beatkind/watchtower/pkg/registry/digest" + t "github.com/beatkind/watchtower/pkg/types" ) const defaultStopSignal = "SIGTERM" diff --git a/pkg/container/client_test.go b/pkg/container/client_test.go index 4e75409..0bb6177 100644 --- a/pkg/container/client_test.go +++ b/pkg/container/client_test.go @@ -4,10 +4,10 @@ import ( "github.com/docker/docker/api/types/network" "time" - "github.com/containrrr/watchtower/internal/util" - "github.com/containrrr/watchtower/pkg/container/mocks" - "github.com/containrrr/watchtower/pkg/filters" - t "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/util" + "github.com/beatkind/watchtower/pkg/container/mocks" + "github.com/beatkind/watchtower/pkg/filters" + t "github.com/beatkind/watchtower/pkg/types" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" diff --git a/pkg/container/container.go b/pkg/container/container.go index 10ed677..142ef67 100644 --- a/pkg/container/container.go +++ b/pkg/container/container.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/containrrr/watchtower/internal/util" - wt "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/util" + wt "github.com/beatkind/watchtower/pkg/types" "github.com/sirupsen/logrus" "github.com/docker/docker/api/types" diff --git a/pkg/container/container_test.go b/pkg/container/container_test.go index a129afe..a80bf39 100644 --- a/pkg/container/container_test.go +++ b/pkg/container/container_test.go @@ -1,7 +1,7 @@ package container import ( - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" dc "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" . "github.com/onsi/ginkgo" diff --git a/pkg/container/mocks/ApiServer.go b/pkg/container/mocks/ApiServer.go index 84756f0..716618a 100644 --- a/pkg/container/mocks/ApiServer.go +++ b/pkg/container/mocks/ApiServer.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/pkg/container/mocks/container_ref.go b/pkg/container/mocks/container_ref.go index c46eb93..7826880 100644 --- a/pkg/container/mocks/container_ref.go +++ b/pkg/container/mocks/container_ref.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" ) type imageRef struct { diff --git a/pkg/container/util_test.go b/pkg/container/util_test.go index 00912ba..2477e04 100644 --- a/pkg/container/util_test.go +++ b/pkg/container/util_test.go @@ -1,7 +1,7 @@ package container_test import ( - wt "github.com/containrrr/watchtower/pkg/types" + wt "github.com/beatkind/watchtower/pkg/types" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/pkg/filters/filters.go b/pkg/filters/filters.go index 4fa0bcd..b674790 100644 --- a/pkg/filters/filters.go +++ b/pkg/filters/filters.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" ) // WatchtowerContainersFilter filters only watchtower containers diff --git a/pkg/filters/filters_test.go b/pkg/filters/filters_test.go index 2b5cb5e..400bfc2 100644 --- a/pkg/filters/filters_test.go +++ b/pkg/filters/filters_test.go @@ -3,7 +3,7 @@ package filters import ( "testing" - "github.com/containrrr/watchtower/pkg/container/mocks" + "github.com/beatkind/watchtower/pkg/container/mocks" "github.com/stretchr/testify/assert" ) diff --git a/pkg/lifecycle/lifecycle.go b/pkg/lifecycle/lifecycle.go index c0f962e..17c0328 100644 --- a/pkg/lifecycle/lifecycle.go +++ b/pkg/lifecycle/lifecycle.go @@ -1,8 +1,8 @@ package lifecycle import ( - "github.com/containrrr/watchtower/pkg/container" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/container" + "github.com/beatkind/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go index b681733..19ba882 100644 --- a/pkg/metrics/metrics.go +++ b/pkg/metrics/metrics.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" ) diff --git a/pkg/notifications/email.go b/pkg/notifications/email.go index 9103d38..6c41968 100644 --- a/pkg/notifications/email.go +++ b/pkg/notifications/email.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" + t "github.com/beatkind/watchtower/pkg/types" shoutrrrSmtp "github.com/containrrr/shoutrrr/pkg/services/smtp" - t "github.com/containrrr/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/notifications/gotify.go b/pkg/notifications/gotify.go index c36eb4b..ea7d84a 100644 --- a/pkg/notifications/gotify.go +++ b/pkg/notifications/gotify.go @@ -4,8 +4,8 @@ import ( "net/url" "strings" + t "github.com/beatkind/watchtower/pkg/types" shoutrrrGotify "github.com/containrrr/shoutrrr/pkg/services/gotify" - t "github.com/containrrr/watchtower/pkg/types" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/pkg/notifications/json.go b/pkg/notifications/json.go index 20da92b..43a8247 100644 --- a/pkg/notifications/json.go +++ b/pkg/notifications/json.go @@ -3,7 +3,7 @@ package notifications import ( "encoding/json" - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" ) type jsonMap = map[string]interface{} diff --git a/pkg/notifications/json_test.go b/pkg/notifications/json_test.go index ef30c59..bb5a060 100644 --- a/pkg/notifications/json_test.go +++ b/pkg/notifications/json_test.go @@ -1,7 +1,7 @@ package notifications import ( - s "github.com/containrrr/watchtower/pkg/session" + s "github.com/beatkind/watchtower/pkg/session" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/pkg/notifications/model.go b/pkg/notifications/model.go index 83c97ba..37ccac4 100644 --- a/pkg/notifications/model.go +++ b/pkg/notifications/model.go @@ -1,7 +1,7 @@ package notifications import ( - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/notifications/msteams.go b/pkg/notifications/msteams.go index cfca30e..6e8460e 100644 --- a/pkg/notifications/msteams.go +++ b/pkg/notifications/msteams.go @@ -3,8 +3,8 @@ package notifications import ( "net/url" + t "github.com/beatkind/watchtower/pkg/types" shoutrrrTeams "github.com/containrrr/shoutrrr/pkg/services/teams" - t "github.com/containrrr/watchtower/pkg/types" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/pkg/notifications/notifier.go b/pkg/notifications/notifier.go index ff7b6b5..62e819b 100644 --- a/pkg/notifications/notifier.go +++ b/pkg/notifications/notifier.go @@ -5,7 +5,7 @@ import ( "strings" "time" - ty "github.com/containrrr/watchtower/pkg/types" + ty "github.com/beatkind/watchtower/pkg/types" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/pkg/notifications/notifier_test.go b/pkg/notifications/notifier_test.go index 96d513c..61ff789 100644 --- a/pkg/notifications/notifier_test.go +++ b/pkg/notifications/notifier_test.go @@ -5,9 +5,9 @@ import ( "net/url" "time" - "github.com/containrrr/watchtower/cmd" - "github.com/containrrr/watchtower/internal/flags" - "github.com/containrrr/watchtower/pkg/notifications" + "github.com/beatkind/watchtower/cmd" + "github.com/beatkind/watchtower/internal/flags" + "github.com/beatkind/watchtower/pkg/notifications" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/pkg/notifications/preview/data/data.go b/pkg/notifications/preview/data/data.go index 4a002ed..ac82af3 100644 --- a/pkg/notifications/preview/data/data.go +++ b/pkg/notifications/preview/data/data.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) type previewData struct { diff --git a/pkg/notifications/preview/data/report.go b/pkg/notifications/preview/data/report.go index 2c8627f..e342bfd 100644 --- a/pkg/notifications/preview/data/report.go +++ b/pkg/notifications/preview/data/report.go @@ -3,7 +3,7 @@ package data import ( "sort" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) // State is the outcome of a container in a session report diff --git a/pkg/notifications/preview/data/status.go b/pkg/notifications/preview/data/status.go index 33f9bec..7603452 100644 --- a/pkg/notifications/preview/data/status.go +++ b/pkg/notifications/preview/data/status.go @@ -1,6 +1,6 @@ package data -import wt "github.com/containrrr/watchtower/pkg/types" +import wt "github.com/beatkind/watchtower/pkg/types" type containerStatus struct { containerID wt.ContainerID diff --git a/pkg/notifications/preview/tplprev.go b/pkg/notifications/preview/tplprev.go index 8855416..9911cfb 100644 --- a/pkg/notifications/preview/tplprev.go +++ b/pkg/notifications/preview/tplprev.go @@ -5,8 +5,8 @@ import ( "strings" "text/template" - "github.com/containrrr/watchtower/pkg/notifications/preview/data" - "github.com/containrrr/watchtower/pkg/notifications/templates" + "github.com/beatkind/watchtower/pkg/notifications/preview/data" + "github.com/beatkind/watchtower/pkg/notifications/templates" ) func Render(input string, states []data.State, loglevels []data.LogLevel) (string, error) { diff --git a/pkg/notifications/shoutrrr.go b/pkg/notifications/shoutrrr.go index cc3a931..ad9bdb0 100644 --- a/pkg/notifications/shoutrrr.go +++ b/pkg/notifications/shoutrrr.go @@ -8,10 +8,10 @@ import ( "text/template" "time" + "github.com/beatkind/watchtower/pkg/notifications/templates" + t "github.com/beatkind/watchtower/pkg/types" "github.com/containrrr/shoutrrr" "github.com/containrrr/shoutrrr/pkg/types" - "github.com/containrrr/watchtower/pkg/notifications/templates" - t "github.com/containrrr/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/notifications/shoutrrr_test.go b/pkg/notifications/shoutrrr_test.go index 703958b..6f7980a 100644 --- a/pkg/notifications/shoutrrr_test.go +++ b/pkg/notifications/shoutrrr_test.go @@ -3,10 +3,10 @@ package notifications import ( "time" + "github.com/beatkind/watchtower/internal/actions/mocks" + "github.com/beatkind/watchtower/internal/flags" + s "github.com/beatkind/watchtower/pkg/session" "github.com/containrrr/shoutrrr/pkg/types" - "github.com/containrrr/watchtower/internal/actions/mocks" - "github.com/containrrr/watchtower/internal/flags" - s "github.com/containrrr/watchtower/pkg/session" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/pkg/notifications/slack.go b/pkg/notifications/slack.go index 9118527..ad5384b 100644 --- a/pkg/notifications/slack.go +++ b/pkg/notifications/slack.go @@ -3,9 +3,9 @@ package notifications import ( "strings" + t "github.com/beatkind/watchtower/pkg/types" shoutrrrDisco "github.com/containrrr/shoutrrr/pkg/services/discord" shoutrrrSlack "github.com/containrrr/shoutrrr/pkg/services/slack" - t "github.com/containrrr/watchtower/pkg/types" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/pkg/registry/auth/auth.go b/pkg/registry/auth/auth.go index 99b05c9..242cc22 100644 --- a/pkg/registry/auth/auth.go +++ b/pkg/registry/auth/auth.go @@ -9,8 +9,8 @@ import ( "net/url" "strings" - "github.com/containrrr/watchtower/pkg/registry/helpers" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/registry/helpers" + "github.com/beatkind/watchtower/pkg/types" ref "github.com/distribution/reference" "github.com/sirupsen/logrus" ) diff --git a/pkg/registry/auth/auth_test.go b/pkg/registry/auth/auth_test.go index d295310..d26931b 100644 --- a/pkg/registry/auth/auth_test.go +++ b/pkg/registry/auth/auth_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/containrrr/watchtower/internal/actions/mocks" - "github.com/containrrr/watchtower/pkg/registry/auth" + "github.com/beatkind/watchtower/internal/actions/mocks" + "github.com/beatkind/watchtower/pkg/registry/auth" - wtTypes "github.com/containrrr/watchtower/pkg/types" + wtTypes "github.com/beatkind/watchtower/pkg/types" ref "github.com/distribution/reference" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/registry/digest/digest.go b/pkg/registry/digest/digest.go index e569599..8c5963b 100644 --- a/pkg/registry/digest/digest.go +++ b/pkg/registry/digest/digest.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "github.com/containrrr/watchtower/internal/meta" - "github.com/containrrr/watchtower/pkg/registry/auth" - "github.com/containrrr/watchtower/pkg/registry/manifest" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/meta" + "github.com/beatkind/watchtower/pkg/registry/auth" + "github.com/beatkind/watchtower/pkg/registry/manifest" + "github.com/beatkind/watchtower/pkg/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/registry/digest/digest_test.go b/pkg/registry/digest/digest_test.go index a6e6650..aa0d0f7 100644 --- a/pkg/registry/digest/digest_test.go +++ b/pkg/registry/digest/digest_test.go @@ -2,9 +2,9 @@ package digest_test import ( "fmt" - "github.com/containrrr/watchtower/internal/actions/mocks" - "github.com/containrrr/watchtower/pkg/registry/digest" - wtTypes "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/actions/mocks" + "github.com/beatkind/watchtower/pkg/registry/digest" + wtTypes "github.com/beatkind/watchtower/pkg/types" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/pkg/registry/helpers/helpers_test.go b/pkg/registry/helpers/helpers_test.go index a561c2c..7918de7 100644 --- a/pkg/registry/helpers/helpers_test.go +++ b/pkg/registry/helpers/helpers_test.go @@ -31,7 +31,7 @@ var _ = Describe("the helpers", func() { Expect(GetRegistryAddress("localhost/watchtower")).To(Equal("localhost")) }) It("should return the server address if passed a fully qualified image name", func() { - Expect(GetRegistryAddress("github.com/containrrr/config")).To(Equal("github.com")) + Expect(GetRegistryAddress("github.com/beatkind/config")).To(Equal("github.com")) }) }) }) diff --git a/pkg/registry/manifest/manifest.go b/pkg/registry/manifest/manifest.go index c732bae..119b0b7 100644 --- a/pkg/registry/manifest/manifest.go +++ b/pkg/registry/manifest/manifest.go @@ -5,8 +5,8 @@ import ( "fmt" url2 "net/url" - "github.com/containrrr/watchtower/pkg/registry/helpers" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/registry/helpers" + "github.com/beatkind/watchtower/pkg/types" ref "github.com/distribution/reference" "github.com/sirupsen/logrus" ) diff --git a/pkg/registry/manifest/manifest_test.go b/pkg/registry/manifest/manifest_test.go index b24d9bc..92eef97 100644 --- a/pkg/registry/manifest/manifest_test.go +++ b/pkg/registry/manifest/manifest_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/containrrr/watchtower/internal/actions/mocks" - "github.com/containrrr/watchtower/pkg/registry/manifest" + "github.com/beatkind/watchtower/internal/actions/mocks" + "github.com/beatkind/watchtower/pkg/registry/manifest" apiTypes "github.com/docker/docker/api/types" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/registry/registry.go b/pkg/registry/registry.go index 430b401..5fbfe9f 100644 --- a/pkg/registry/registry.go +++ b/pkg/registry/registry.go @@ -1,8 +1,8 @@ package registry import ( - "github.com/containrrr/watchtower/pkg/registry/helpers" - watchtowerTypes "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/registry/helpers" + watchtowerTypes "github.com/beatkind/watchtower/pkg/types" ref "github.com/distribution/reference" "github.com/docker/docker/api/types" log "github.com/sirupsen/logrus" diff --git a/pkg/registry/registry_test.go b/pkg/registry/registry_test.go index 481c91d..79c94f4 100644 --- a/pkg/registry/registry_test.go +++ b/pkg/registry/registry_test.go @@ -1,8 +1,8 @@ package registry_test import ( - "github.com/containrrr/watchtower/internal/actions/mocks" - unit "github.com/containrrr/watchtower/pkg/registry" + "github.com/beatkind/watchtower/internal/actions/mocks" + unit "github.com/beatkind/watchtower/pkg/registry" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/registry/trust.go b/pkg/registry/trust.go index 0b20248..86ebf68 100644 --- a/pkg/registry/trust.go +++ b/pkg/registry/trust.go @@ -6,7 +6,7 @@ import ( "errors" "os" - "github.com/containrrr/watchtower/pkg/registry/helpers" + "github.com/beatkind/watchtower/pkg/registry/helpers" cliconfig "github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/credentials" @@ -36,7 +36,7 @@ func EncodedEnvAuth() (string, error) { Username: username, Password: password, } - + log.Debugf("Loaded auth credentials for registry user %s from environment", auth.Username) // CREDENTIAL: Uncomment to log REPO_PASS environment variable // log.Tracef("Using auth password %s", auth.Password) diff --git a/pkg/session/container_status.go b/pkg/session/container_status.go index 8313da1..d7e6368 100644 --- a/pkg/session/container_status.go +++ b/pkg/session/container_status.go @@ -1,6 +1,6 @@ package session -import wt "github.com/containrrr/watchtower/pkg/types" +import wt "github.com/beatkind/watchtower/pkg/types" // State indicates what the current state is of the container type State int diff --git a/pkg/session/progress.go b/pkg/session/progress.go index 57069be..ca415c5 100644 --- a/pkg/session/progress.go +++ b/pkg/session/progress.go @@ -1,7 +1,7 @@ package session import ( - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) // Progress contains the current session container status diff --git a/pkg/session/report.go b/pkg/session/report.go index 707eb91..20d4acf 100644 --- a/pkg/session/report.go +++ b/pkg/session/report.go @@ -3,7 +3,7 @@ package session import ( "sort" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) type report struct { diff --git a/pkg/sorter/sort.go b/pkg/sorter/sort.go index b9d1e12..a365303 100644 --- a/pkg/sorter/sort.go +++ b/pkg/sorter/sort.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) // ByCreated allows a list of Container structs to be sorted by the container's diff --git a/tplprev/main.go b/tplprev/main.go index 120f968..4a1d9a5 100644 --- a/tplprev/main.go +++ b/tplprev/main.go @@ -7,9 +7,9 @@ import ( "fmt" "os" - "github.com/containrrr/watchtower/internal/meta" - "github.com/containrrr/watchtower/pkg/notifications/preview" - "github.com/containrrr/watchtower/pkg/notifications/preview/data" + "github.com/beatkind/watchtower/internal/meta" + "github.com/beatkind/watchtower/pkg/notifications/preview" + "github.com/beatkind/watchtower/pkg/notifications/preview/data" ) func main() { diff --git a/tplprev/main_wasm.go b/tplprev/main_wasm.go index 5e2ce6a..a6ebc74 100644 --- a/tplprev/main_wasm.go +++ b/tplprev/main_wasm.go @@ -5,9 +5,9 @@ package main import ( "fmt" - "github.com/containrrr/watchtower/internal/meta" - "github.com/containrrr/watchtower/pkg/notifications/preview" - "github.com/containrrr/watchtower/pkg/notifications/preview/data" + "github.com/beatkind/watchtower/internal/meta" + "github.com/beatkind/watchtower/pkg/notifications/preview" + "github.com/beatkind/watchtower/pkg/notifications/preview/data" "syscall/js" )