Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-12-16 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: set nopull param from args

Browse source 
this also fully removes `PullImages` from the client options
as it is no longer used.
This commit is contained in:
nils måsén 2023-11-11 14:12:24 +01:00
parent 72e437f173
commit 8f736a371e
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmd/root.go
View file

@ -33,6 +33,7 @@ var (
scheduleSpec string scheduleSpec string
cleanup bool cleanup bool
noRestart bool noRestart bool
noPull bool
monitorOnly bool monitorOnly bool
enableLabel bool enableLabel bool
disableContainers []string disableContainers []string
@ -110,7 +111,7 @@ func PreRun(cmd *cobra.Command, _ []string) {
log.Fatal(err) log.Fatal(err)
} }
noPull, _ := f.GetBool("no-pull") noPull, _ = f.GetBool("no-pull")
includeStopped, _ := f.GetBool("include-stopped") includeStopped, _ := f.GetBool("include-stopped")
includeRestarting, _ := f.GetBool("include-restarting") includeRestarting, _ := f.GetBool("include-restarting")
reviveStopped, _ := f.GetBool("revive-stopped") reviveStopped, _ := f.GetBool("revive-stopped")
@ -122,7 +123,6 @@ func PreRun(cmd *cobra.Command, _ []string) {
} }
client = container.NewClient(container.ClientOptions{ client = container.NewClient(container.ClientOptions{
PullImages: !noPull,
IncludeStopped: includeStopped, IncludeStopped: includeStopped,
ReviveStopped: reviveStopped, ReviveStopped: reviveStopped,
RemoveVolumes: removeVolumes, RemoveVolumes: removeVolumes,
@ -367,6 +367,7 @@ func runUpdatesWithNotifications(filter t.Filter) *metrics.Metric {
LifecycleHooks: lifecycleHooks, LifecycleHooks: lifecycleHooks,
RollingRestart: rollingRestart, RollingRestart: rollingRestart,
LabelPrecedence: labelPrecedence, LabelPrecedence: labelPrecedence,
NoPull: noPull,
} }
result, err := actions.Update(client, updateParams) result, err := actions.Update(client, updateParams)
if err != nil { if err != nil {

1
pkg/container/client.go
View file

@ -57,7 +57,6 @@ func NewClient(opts ClientOptions) Client {
// ClientOptions contains the options for how the docker client wrapper should behave // ClientOptions contains the options for how the docker client wrapper should behave
type ClientOptions struct { type ClientOptions struct {
PullImages bool
RemoveVolumes bool RemoveVolumes bool
IncludeStopped bool IncludeStopped bool
ReviveStopped bool ReviveStopped bool

20
pkg/container/client_test.go
View file

@ -144,7 +144,7 @@ var _ = Describe("the client", func() {
mockServer.AppendHandlers(mocks.GetContainerHandlers(&mocks.Watchtower, &mocks.Running)...) mockServer.AppendHandlers(mocks.GetContainerHandlers(&mocks.Watchtower, &mocks.Running)...)
client := dockerClient{ client := dockerClient{
api: docker, api: docker,
ClientOptions: ClientOptions{PullImages: false}, ClientOptions: ClientOptions{},
} }
containers, err := client.ListContainers(filters.NoFilter) containers, err := client.ListContainers(filters.NoFilter)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -158,7 +158,7 @@ var _ = Describe("the client", func() {
filter := filters.FilterByNames([]string{"lollercoaster"}, filters.NoFilter) filter := filters.FilterByNames([]string{"lollercoaster"}, filters.NoFilter)
client := dockerClient{ client := dockerClient{
api: docker, api: docker,
ClientOptions: ClientOptions{PullImages: false}, ClientOptions: ClientOptions{},
} }
containers, err := client.ListContainers(filter) containers, err := client.ListContainers(filter)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -171,7 +171,7 @@ var _ = Describe("the client", func() {
mockServer.AppendHandlers(mocks.GetContainerHandlers(&mocks.Watchtower, &mocks.Running)...) mockServer.AppendHandlers(mocks.GetContainerHandlers(&mocks.Watchtower, &mocks.Running)...)
client := dockerClient{ client := dockerClient{
api: docker, api: docker,
ClientOptions: ClientOptions{PullImages: false}, ClientOptions: ClientOptions{},
} }
containers, err := client.ListContainers(filters.WatchtowerContainersFilter) containers, err := client.ListContainers(filters.WatchtowerContainersFilter)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -184,7 +184,7 @@ var _ = Describe("the client", func() {
mockServer.AppendHandlers(mocks.GetContainerHandlers(&mocks.Stopped, &mocks.Watchtower, &mocks.Running)...) mockServer.AppendHandlers(mocks.GetContainerHandlers(&mocks.Stopped, &mocks.Watchtower, &mocks.Running)...)
client := dockerClient{ client := dockerClient{
api: docker, api: docker,
ClientOptions: ClientOptions{PullImages: false, IncludeStopped: true}, ClientOptions: ClientOptions{IncludeStopped: true},
} }
containers, err := client.ListContainers(filters.NoFilter) containers, err := client.ListContainers(filters.NoFilter)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -197,7 +197,7 @@ var _ = Describe("the client", func() {
mockServer.AppendHandlers(mocks.GetContainerHandlers(&mocks.Watchtower, &mocks.Running, &mocks.Restarting)...) mockServer.AppendHandlers(mocks.GetContainerHandlers(&mocks.Watchtower, &mocks.Running, &mocks.Restarting)...)
client := dockerClient{ client := dockerClient{
api: docker, api: docker,
ClientOptions: ClientOptions{PullImages: false, IncludeRestarting: true}, ClientOptions: ClientOptions{IncludeRestarting: true},
} }
containers, err := client.ListContainers(filters.NoFilter) containers, err := client.ListContainers(filters.NoFilter)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -210,7 +210,7 @@ var _ = Describe("the client", func() {
mockServer.AppendHandlers(mocks.GetContainerHandlers(&mocks.Watchtower, &mocks.Running)...) mockServer.AppendHandlers(mocks.GetContainerHandlers(&mocks.Watchtower, &mocks.Running)...)
client := dockerClient{ client := dockerClient{
api: docker, api: docker,
ClientOptions: ClientOptions{PullImages: false, IncludeRestarting: false}, ClientOptions: ClientOptions{IncludeRestarting: false},
} }
containers, err := client.ListContainers(filters.NoFilter) containers, err := client.ListContainers(filters.NoFilter)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -224,7 +224,7 @@ var _ = Describe("the client", func() {
mockServer.AppendHandlers(mocks.GetContainerHandlers(&consumerContainerRef)...) mockServer.AppendHandlers(mocks.GetContainerHandlers(&consumerContainerRef)...)
client := dockerClient{ client := dockerClient{
api: docker, api: docker,
ClientOptions: ClientOptions{PullImages: false}, ClientOptions: ClientOptions{},
} }
container, err := client.GetContainer(consumerContainerRef.ContainerID()) container, err := client.GetContainer(consumerContainerRef.ContainerID())
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -238,7 +238,7 @@ var _ = Describe("the client", func() {
mockServer.AppendHandlers(mocks.GetContainerHandlers(&consumerContainerRef)...) mockServer.AppendHandlers(mocks.GetContainerHandlers(&consumerContainerRef)...)
client := dockerClient{ client := dockerClient{
api: docker, api: docker,
ClientOptions: ClientOptions{PullImages: false}, ClientOptions: ClientOptions{},
} }
container, err := client.GetContainer(consumerContainerRef.ContainerID()) container, err := client.GetContainer(consumerContainerRef.ContainerID())
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -253,7 +253,7 @@ var _ = Describe("the client", func() {
It("should include container id field", func() { It("should include container id field", func() {
client := dockerClient{ client := dockerClient{
api: docker, api: docker,
ClientOptions: ClientOptions{PullImages: false}, ClientOptions: ClientOptions{},
} }
// Capture logrus output in buffer // Capture logrus output in buffer
@ -320,7 +320,7 @@ var _ = Describe("the client", func() {
It(`should omit the container ID alias`, func() { It(`should omit the container ID alias`, func() {
client := dockerClient{ client := dockerClient{
api: docker, api: docker,
ClientOptions: ClientOptions{PullImages: false, IncludeRestarting: false}, ClientOptions: ClientOptions{IncludeRestarting: false},
} }
container := MockContainer(WithImageName("docker.io/prefix/imagename:latest")) container := MockContainer(WithImageName("docker.io/prefix/imagename:latest"))