Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-09-22 05:40:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: resolve merge issues

Browse source
This commit is contained in:
Simon Aronsson 2019-07-23 09:36:04 +02:00
parent dff16dc639
commit 874180a518
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/container/client.go
View file

@ -247,7 +247,7 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
// the pull request will be aborted prematurely unless the response is read // the pull request will be aborted prematurely unless the response is read
if _, err = ioutil.ReadAll(response); err != nil { if _, err = ioutil.ReadAll(response); err != nil {
log.Error(err) log.Error(err)
} }
} }
newImageInfo, _, err := client.api.ImageInspectWithRaw(bg, imageName) newImageInfo, _, err := client.api.ImageInspectWithRaw(bg, imageName)

3
notifications/gotify.go → pkg/notifications/gotify.go
View file

@ -7,6 +7,7 @@ import (
"net/http" "net/http"
"strings" "strings"
t "github.com/containrrr/watchtower/pkg/types"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -21,7 +22,7 @@ type gotifyTypeNotifier struct {
logLevels []log.Level 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() flags := c.PersistentFlags()
gotifyURL, _ := flags.GetString("notification-gotify-url") gotifyURL, _ := flags.GetString("notification-gotify-url")