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

Merge e802e1642a into 76f9cea516

Browse source
This commit is contained in:
Benjamin Faal 2024-11-21 20:17:01 +01:00 • committed by GitHub
commit 9e2653d32d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 39 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/http-api-mode.md
View file

@ -43,3 +43,8 @@ In order to update only certain images, the image names can be provided as URL q
```bash
curl -H "Authorization: Bearer mytoken" localhost:8080/v1/update?image=foo/bar,foo/baz
```
tags are also supported:
```bash
curl -H "Authorization: Bearer mytoken" localhost:8080/v1/update?image=foo/baz:latest
```

10
pkg/filters/filters.go
View file

@ -108,9 +108,15 @@ func FilterByImage(images []string, baseFilter t.Filter) t.Filter {
}
return func(c t.FilterableContainer) bool {
image := strings.Split(c.ImageName(), ":")[0]
imageParts := strings.Split(c.ImageName(), ":")
for _, targetImage := range images {
if image == targetImage {
targetImageParts := strings.Split(targetImage, ":")
if imageParts[0] == targetImageParts[0] {
if len(imageParts) == 2 && len(targetImageParts) == 2 {
if imageParts[1] != targetImageParts[1] {
continue
}
}
return baseFilter(c)
}
}

26
pkg/filters/filters_test.go
View file

@ -213,6 +213,32 @@ func TestFilterByImage(t *testing.T) {
assert.True(t, filterMultiple(container))
container.AssertExpectations(t)
filterEmptyTagged := FilterByImage(nil, NoFilter)
filterSingleTagged := FilterByImage([]string{"registry:develop"}, NoFilter)
filterMultipleTagged := FilterByImage([]string{"registry:develop", "registry:latest"}, NoFilter)
assert.NotNil(t, filterSingleTagged)
assert.NotNil(t, filterMultipleTagged)
container = new(mocks.FilterableContainer)
container.On("ImageName").Return("bla:latest")
assert.True(t, filterEmptyTagged(container))
assert.False(t, filterSingleTagged(container))
assert.False(t, filterMultipleTagged(container))
container.AssertExpectations(t)
container = new(mocks.FilterableContainer)
container.On("ImageName").Return("registry:latest")
assert.True(t, filterEmptyTagged(container))
assert.False(t, filterSingleTagged(container))
assert.True(t, filterMultipleTagged(container))
container.AssertExpectations(t)
container = new(mocks.FilterableContainer)
container.On("ImageName").Return("registry:develop")
assert.True(t, filterEmptyTagged(container))
assert.True(t, filterSingleTagged(container))
assert.True(t, filterMultipleTagged(container))
container.AssertExpectations(t)
}
func TestBuildFilter(t *testing.T) {