From 874180a51878b737527d12936612b7a83cf5489a Mon Sep 17 00:00:00 2001 From: Simon Aronsson Date: Tue, 23 Jul 2019 09:36:04 +0200 Subject: [PATCH] fix: resolve merge issues --- pkg/container/client.go | 2 +- {notifications => pkg/notifications}/gotify.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename {notifications => pkg/notifications}/gotify.go (97%) diff --git a/pkg/container/client.go b/pkg/container/client.go index 2aa6bc0..124e889 100644 --- a/pkg/container/client.go +++ b/pkg/container/client.go @@ -247,7 +247,7 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) { // the pull request will be aborted prematurely unless the response is read if _, err = ioutil.ReadAll(response); err != nil { log.Error(err) - } + } } newImageInfo, _, err := client.api.ImageInspectWithRaw(bg, imageName) diff --git a/notifications/gotify.go b/pkg/notifications/gotify.go similarity index 97% rename from notifications/gotify.go rename to pkg/notifications/gotify.go index 733bddd..47ea884 100644 --- a/notifications/gotify.go +++ b/pkg/notifications/gotify.go @@ -7,6 +7,7 @@ import ( "net/http" "strings" + t "github.com/containrrr/watchtower/pkg/types" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) @@ -21,7 +22,7 @@ type gotifyTypeNotifier struct { logLevels []log.Level } -func newGotifyNotifier(c *cobra.Command, acceptedLogLevels []log.Level) typeNotifier { +func newGotifyNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Notifier { flags := c.PersistentFlags() gotifyURL, _ := flags.GetString("notification-gotify-url")