Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

c8d: Add image events #46405

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

Merged
merged 3 commits into from
Sep 6, 2023
Merged

c8d: Add image events #46405

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1847dc4
c8d: Add image push events
rumpl Sep 5, 2023
09470db
c8d: Add image pull events
rumpl Sep 5, 2023
dbb4d54
c8d: Add image save events
rumpl Sep 5, 2023
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
Prev Previous commit
c8d: Add image save events 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
  • Loading branch information
@rumpl
rumpl committed Sep 5, 2023
commit dbb4d54e01bd9ecd6537d851be8fe066963b009e
2 changes: 2 additions & 0 deletions 2 daemon/containerd/image_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ func (i *ImageService) ExportImage(ctx context.Context, names []string, outStrea
"target": target,
}).Debug("export image without name")
}

i.LogImageEvent(target.Digest.String(), target.Digest.String(), events.ActionSave)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SO confusing that it's "image expert", but actually "image save" 😞

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to check 3 times to make sure it's the right one...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The image is not exported at this point yet. We should log the events after Export returns a nil error.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the way graph drivers work too. Also you could export multiple images…

so it’s more “ready to export this image” rather than “this image was exported”

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, right. That's weird though.. but if that's how it worked with the graphdrivers then it should stay that way. Sorry!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is weird. I’ll give you that. I even did what you said at one point but reverted. It would be too big of a change. Maybe we can fix this in a followup, fix both implementations if we think it’s useful

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we should map what events we trigger "where" and with what information. Many of them where just added "willy-nilly" in the code, but not all were properly defined.

Should be slightly easier to find all locations now that we have the consts defined, but it could use some tweaking (and documenting) overall

}

return i.client.Export(ctx, outStream, opts...)
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.