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

Merge 1ed78514c5 into 76f9cea516

Browse source
This commit is contained in:
Abdullah Farid 2024-03-02 13:21:25 +00:00 • committed by GitHub
commit 90a4fd505a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/arguments.md
View file

@ -448,7 +448,7 @@ Returns a success exit code to enable usage with docker `HEALTHCHECK`. This chec
Argument: --health-check
```
## Programatic Output (porcelain)
## Programmatic Output (porcelain)
Writes the session results to STDOUT using a stable, machine-readable format (indicated by the argument VERSION).

2
docs/running-multiple-instances.md
View file

@ -3,7 +3,7 @@ By default, Watchtower will clean up other instances and won't allow multiple in
!!! note
- Multiple instances can't run with the same scope;
- An instance without a scope will clean up other running instances, even if they have a defined scope;
- Supplying `none` as the scope will treat `com.centurylinklabs.watchtower.scope=none`, `com.centurylinklabs.watchtower.scope=` and the lack of a `com.centurylinklabs.watchtower.scope` label as the scope `none`. This effectly enables you to run both scoped and unscoped watchtower instances on the same machine.
- Supplying `none` as the scope will treat `com.centurylinklabs.watchtower.scope=none`, `com.centurylinklabs.watchtower.scope=` and the lack of a `com.centurylinklabs.watchtower.scope` label as the scope `none`. This effectively enables you to run both scoped and unscoped watchtower instances on the same machine.
To define an instance monitoring scope, use the `--scope` argument or the `WATCHTOWER_SCOPE` environment variable on startup and set the `com.centurylinklabs.watchtower.scope` label with the same value for the containers you want to include in this instance's scope (including the instance itself).

4
internal/flags/flags_test.go
View file

@ -278,9 +278,9 @@ func TestProcessFlagAliasesInvalidPorcelaineVersion(t *testing.T) {
})
}
func TestFlagsArePrecentInDocumentation(t *testing.T) {
func TestFlagsArePresentInDocumentation(t *testing.T) {
// Legacy notifcations are ignored, since they are (soft) deprecated
// Legacy notifications are ignored, since they are (soft) deprecated
ignoredEnvs := map[string]string{
"WATCHTOWER_NOTIFICATION_SLACK_ICON_EMOJI": "legacy",
"WATCHTOWER_NOTIFICATION_SLACK_ICON_URL": "legacy",

2
pkg/notifications/notifier_test.go
View file

@ -28,7 +28,7 @@ var _ = Describe("notifications", func() {
Expect(notif.GetNames()).To(BeEmpty())
})
When("title is overriden in flag", func() {
When("title is overridden in flag", func() {
It("should use the specified hostname in the title", func() {
command := cmd.NewRootCommand()
flags.RegisterNotificationFlags(command)