Skip to content

Skip manifest pull if ignoring image updates #1422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Skip manifest pull if ignoring image updates #1422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions internal/app/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,20 @@ func (di *Diun) runJob(job model.Job) (entry model.NotifEntry) {
}

var updated bool
entry.Manifest, updated, err = job.Registry.Manifest(job.RegImage, dbManifest)
if err != nil {
sublog.Warn().Err(err).Msg("Cannot get remote manifest")
return

// If we care about updated models, go check for an update
if model.NotifyOnUpdate.OneOf(job.Image.NotifyOn) {
entry.Manifest, updated, err = job.Registry.Manifest(job.RegImage, dbManifest)
if err != nil {
sublog.Warn().Err(err).Msg("Cannot get remote manifest")
return
}
} else {
// Otherwise use a stub
entry.Manifest = registry.Manifest{
Name: job.RegImage.Name(),
Tag: job.RegImage.Tag,
}
}

if v, ok := entry.Manifest.Labels["org.opencontainers.image.url"]; ok {
Expand Down
11 changes: 4 additions & 7 deletions internal/model/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package model

import (
"slices"

"github.com/crazy-max/diun/v4/pkg/registry"
)

Expand Down Expand Up @@ -60,11 +62,6 @@ func (ns *NotifyOn) Valid() bool {
}

// OneOf checks if notify status is one of the values in the list
func (ns *NotifyOn) OneOf(nsl []NotifyOn) bool {
for _, n := range nsl {
if n == *ns {
return true
}
}
return false
func (ns NotifyOn) OneOf(nsl []NotifyOn) bool {
return slices.Contains(nsl, ns)
}
Loading