Skip to content
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.

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

Fix invalid index.json annotations on tar=false export #5589

Merged
merged 2 commits into from
Jan 7, 2025

Conversation

tonistiigi
Copy link
Member

@tonistiigi tonistiigi commented Dec 11, 2024

fixes #5572

@tonistiigi tonistiigi force-pushed the ociindex-annotations-fix branch from 7c1309b to cb43103 Compare December 12, 2024 01:58
@tonistiigi tonistiigi force-pushed the ociindex-annotations-fix branch 2 times, most recently from 5906c86 to 3dab3f3 Compare December 12, 2024 02:15
@tonistiigi tonistiigi changed the title [wip] Fix invalid index.json annotations on tar=false export Fix invalid index.json annotations on tar=false export Dec 12, 2024
@tonistiigi tonistiigi marked this pull request as ready for review December 12, 2024 02:15
@tonistiigi
Copy link
Member Author

cc @tianon

Note that this is client-side fix. In order for this to change in buildx, vendor of buildkit needs to be updated there.

@tonistiigi tonistiigi requested a review from Copilot December 12, 2024 02:19
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 suggestion.

client/solve.go Show resolved Hide resolved
@tonistiigi tonistiigi added this to the v0.19.0 milestone Dec 16, 2024
@@ -15,6 +17,8 @@ import (
const (
// lockFileSuffix is the suffix of the lock file
lockFileSuffix = ".lock"

annotationImageName = "io.containerd.image.name"
Copy link
Member

Choose a reason for hiding this comment

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

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 don't want to create a containerd dependency to this well-contained utility pkg.

@AkihiroSuda
Copy link
Member

Needs rebase

Previous implementation mixed tags and names and
added invalid comma-separated reference annotation.

Signed-off-by: Tonis Tiigi <[email protected]>
@tonistiigi tonistiigi force-pushed the ociindex-annotations-fix branch from 3dab3f3 to 01cf0c6 Compare January 7, 2025 22:32
@tonistiigi tonistiigi merged commit 4c68785 into moby:master Jan 7, 2025
96 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

--output type=oci,tar=false produces inconsistent (and invalid 😬) annotations
2 participants