mirrors/diun
1
0
Fork 0
mirror of https://github.com/crazy-max/diun.git synced 2025-12-21 21:33:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1063 from adamantike/fix/use-defaults-in-file-provider

Browse Source 
fix: Use global defaults in File provider
This commit is contained in:
CrazyMax
2023-12-30 02:28:47 +01:00
committed by GitHub
parent ae1e3e09e6 29200f170d
commit 3ee6a55f7e
3 changed files with 104 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
internal/provider/file/file_test.go
View File

@@ -13,6 +13,13 @@ var (
defaults = model.Defaults{
NotifyOn: model.NotifyOnDefaults,
SortTags: registry.SortTagReverse,
MaxTags: 25,
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
}
bintrayFile = []model.Job{
{
@@ -22,6 +29,13 @@ var (
RegOpt: "bintrayoptions",
NotifyOn: model.NotifyOnDefaults,
SortTags: registry.SortTagReverse,
MaxTags: 25,
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
{
@@ -34,6 +48,12 @@ var (
},
SortTags: registry.SortTagLexicographical,
MaxTags: 50,
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
}
@@ -45,6 +65,13 @@ var (
RegOpt: "myregistry",
NotifyOn: model.NotifyOnDefaults,
SortTags: registry.SortTagReverse,
MaxTags: 25,
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
{
@@ -54,9 +81,13 @@ var (
WatchRepo: utl.NewTrue(),
NotifyOn: model.NotifyOnDefaults,
SortTags: registry.SortTagSemver,
MaxTags: 25,
IncludeTags: []string{
`^1\.2\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
{
@@ -70,6 +101,9 @@ var (
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
{
@@ -79,6 +113,13 @@ var (
WatchRepo: utl.NewTrue(),
NotifyOn: model.NotifyOnDefaults,
SortTags: registry.SortTagDefault,
MaxTags: 25,
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`latest`,
},
},
},
{
@@ -92,6 +133,13 @@ var (
Arch: "arm64",
Variant: "v8",
},
MaxTags: 25,
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
{
@@ -100,6 +148,13 @@ var (
Name: "docker.io/graylog/graylog:3.2.0",
NotifyOn: model.NotifyOnDefaults,
SortTags: registry.SortTagReverse,
MaxTags: 25,
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
{
@@ -108,6 +163,13 @@ var (
Name: "jacobalberty/unifi:5.9",
NotifyOn: model.NotifyOnDefaults,
SortTags: registry.SortTagReverse,
MaxTags: 25,
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
{
@@ -117,9 +179,13 @@ var (
WatchRepo: utl.NewTrue(),
NotifyOn: model.NotifyOnDefaults,
SortTags: registry.SortTagReverse,
MaxTags: 25,
IncludeTags: []string{
`^1\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
}
@@ -130,6 +196,13 @@ var (
Name: "quay.io/coreos/hyperkube",
NotifyOn: model.NotifyOnDefaults,
SortTags: registry.SortTagReverse,
MaxTags: 25,
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
{
@@ -138,6 +211,13 @@ var (
Name: "quay.io/coreos/hyperkube:v1.1.7-coreos.1",
NotifyOn: model.NotifyOnDefaults,
SortTags: registry.SortTagReverse,
MaxTags: 25,
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
}
@@ -149,6 +229,13 @@ var (
NotifyOn: model.NotifyOnDefaults,
SortTags: registry.SortTagReverse,
HubLink: "https://fleet.linuxserver.io/image?name=linuxserver/heimdall",
MaxTags: 25,
IncludeTags: []string{
`^(0|[1-9]\d*)\..*`,
},
ExcludeTags: []string{
`^0\.0\..*`,
},
},
},
}

2
internal/provider/file/fixtures/dockerhub.yml
View File

@@ -14,6 +14,8 @@
- name: traefik
watch_repo: true
sort_tags: default
exclude_tags:
- latest
- name: alpine
platform:
os: linux

15
internal/provider/file/image.go
View File

@@ -80,6 +80,21 @@ func (c *Client) listFileImage() []model.Image {
}
}
// Set default MaxTags
if item.MaxTags == 0 {
item.MaxTags = c.defaults.MaxTags
}
// Set default IncludeTags
if len(item.IncludeTags) == 0 {
item.IncludeTags = c.defaults.IncludeTags
}
// Set default ExcludeTags
if len(item.ExcludeTags) == 0 {
item.ExcludeTags = c.defaults.ExcludeTags
}
images = append(images, item)
}
}