mirror of
https://github.com/containrrr/watchtower.git
synced 2025-12-16 15:10:12 +01:00
Add more update test when label take precedence is true.
Fix issue in arguments.md
This commit is contained in:
parent
85f960c5eb
commit
0baaf647f1
2 changed files with 47 additions and 4 deletions
|
|
@ -238,8 +238,7 @@ Environment Variable: WATCHTOWER_MONITOR_ONLY
|
||||||
|
|
||||||
Note that monitor-only can also be specified on a per-container basis with the `com.centurylinklabs.watchtower.monitor-only` label set on those containers.
|
Note that monitor-only can also be specified on a per-container basis with the `com.centurylinklabs.watchtower.monitor-only` label set on those containers.
|
||||||
|
|
||||||
See [With label taking precedence over arguments](##With label taking precedence over arguments) for behavior when both agument and label are set
|
See [With label taking precedence over arguments](#With-label-taking-precedence-over-arguments) for behavior when both argument and label are set
|
||||||
|
|
||||||
|
|
||||||
## With label taking precedence over arguments
|
## With label taking precedence over arguments
|
||||||
|
|
||||||
|
|
@ -278,7 +277,7 @@ Environment Variable: WATCHTOWER_NO_PULL
|
||||||
Note that no-pull can also be specified on a per-container basis with the
|
Note that no-pull can also be specified on a per-container basis with the
|
||||||
`com.centurylinklabs.watchtower.no-pull` label set on those containers.
|
`com.centurylinklabs.watchtower.no-pull` label set on those containers.
|
||||||
|
|
||||||
See [With label taking precedence over arguments](##With label taking precedence over arguments) for behavior when both agument and label are set
|
See [With label taking precedence over arguments](#With-label-taking-precedence-over-arguments) for behavior when both argument and label are set
|
||||||
|
|
||||||
## Without sending a startup message
|
## Without sending a startup message
|
||||||
Do not send a message after watchtower started. Otherwise there will be an info-level notification.
|
Do not send a message after watchtower started. Otherwise there will be an info-level notification.
|
||||||
|
|
|
||||||
|
|
@ -182,7 +182,6 @@ var _ = Describe("the update action", func() {
|
||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(err).NotTo(HaveOccurred())
|
||||||
Expect(client.TestData.TriedToRemoveImageCount).To(Equal(0))
|
Expect(client.TestData.TriedToRemoveImageCount).To(Equal(0))
|
||||||
})
|
})
|
||||||
|
|
||||||
When("watchtower has been instructed to have label take precedence", func() {
|
When("watchtower has been instructed to have label take precedence", func() {
|
||||||
It("it should update containers when monitor only is set to false", func() {
|
It("it should update containers when monitor only is set to false", func() {
|
||||||
client := CreateMockClient(
|
client := CreateMockClient(
|
||||||
|
|
@ -210,6 +209,51 @@ var _ = Describe("the update action", func() {
|
||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(err).NotTo(HaveOccurred())
|
||||||
Expect(client.TestData.TriedToRemoveImageCount).To(Equal(1))
|
Expect(client.TestData.TriedToRemoveImageCount).To(Equal(1))
|
||||||
})
|
})
|
||||||
|
It("it should update not containers when monitor only is set to true", func() {
|
||||||
|
client := CreateMockClient(
|
||||||
|
&TestData{
|
||||||
|
//NameOfContainerToKeep: "test-container-02",
|
||||||
|
Containers: []types.Container{
|
||||||
|
CreateMockContainerWithConfig(
|
||||||
|
"test-container-02",
|
||||||
|
"test-container-02",
|
||||||
|
"fake-image2:latest",
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
time.Now(),
|
||||||
|
&dockerContainer.Config{
|
||||||
|
Labels: map[string]string{
|
||||||
|
"com.centurylinklabs.watchtower.monitor-only": "true",
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
_, err := actions.Update(client, types.UpdateParams{Cleanup: true, MonitorOnly: true, LabelPrecedence: true})
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
Expect(client.TestData.TriedToRemoveImageCount).To(Equal(0))
|
||||||
|
})
|
||||||
|
It("it should update not containers when monitor only is not set", func() {
|
||||||
|
client := CreateMockClient(
|
||||||
|
&TestData{
|
||||||
|
Containers: []types.Container{
|
||||||
|
CreateMockContainer(
|
||||||
|
"test-container-01",
|
||||||
|
"test-container-01",
|
||||||
|
"fake-image:latest",
|
||||||
|
time.Now()),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
_, err := actions.Update(client, types.UpdateParams{Cleanup: true, MonitorOnly: true, LabelPrecedence: true})
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
Expect(client.TestData.TriedToRemoveImageCount).To(Equal(0))
|
||||||
|
})
|
||||||
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue