Skip to content

Conversation

mtrmac
Copy link
Contributor

@mtrmac mtrmac commented Sep 1, 2025

This should fix containers/skopeo#2686 . (Only unit-tested.)

Also, always use a correct gzip MIME type when pushing (the deprecated schema1) empty layers.

See individual commits for details.

Cc: @jankaluza @Luap99 — let’s see whether/how the monorepo truly helps with cross-module PRs.

@mtrmac
Copy link
Contributor Author

mtrmac commented Sep 1, 2025

Note to self: Within the monorepo, synchronized updates work – but the Skopeo test needs also vendoring in c/storage.

@Luap99
Copy link
Member

Luap99 commented Sep 2, 2025

Note to self: Within the monorepo, synchronized updates work – but the Skopeo test needs also vendoring in c/storage.

Right which is why we must be careful when releasing stuff here so the inter dependencies are still getting resolved correctly, go.work only applies in the repo and not for consumers of the modules.

Do you add a commit here to also add a storage vendor to the skopeo tests, and then I guess while at it we might as well do common as well?

@mtrmac
Copy link
Contributor Author

mtrmac commented Sep 2, 2025

This should fix containers/skopeo#2686 . (Only unit-tested.)

Fix confirmed by containers/skopeo#2686 (comment) .

@mtrmac mtrmac force-pushed the storage-layer-annotations branch 3 times, most recently from 66ea21d to b4a2ea6 Compare September 2, 2025 17:05
mtrmac added a commit to mtrmac/container-libs that referenced this pull request Sep 2, 2025
This is ~necessary to benefit from the monorepo, so that
interdependent updates to c/storage and c/image are tested as a single
unit by the Skopeo test.

Proven in containers#299 .

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac
Copy link
Contributor Author

mtrmac commented Sep 2, 2025

I have separately filed #304 to run Skopeo tests against all repos, marking this one as draft until that merges.

@mtrmac mtrmac marked this pull request as draft September 2, 2025 17:27
mtrmac added a commit to mtrmac/container-libs that referenced this pull request Sep 2, 2025
This is ~necessary to benefit from the monorepo, so that
interdependent updates to c/storage and c/image are tested as a single
unit by the Skopeo test.

Proven in containers#299 .

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
mtrmac added a commit to mtrmac/container-libs that referenced this pull request Sep 2, 2025
This is ~necessary to benefit from the monorepo, so that
interdependent updates to c/storage and c/image are tested as a single
unit by the Skopeo test.

Proven in containers#299 .

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac mtrmac force-pushed the storage-layer-annotations branch from b4a2ea6 to bf127aa Compare September 3, 2025 16:58
@mtrmac mtrmac marked this pull request as ready for review September 3, 2025 17:30
@mtrmac
Copy link
Contributor Author

mtrmac commented Sep 3, 2025

Ready for review, PTAL.

@mtrmac mtrmac force-pushed the storage-layer-annotations branch from bf127aa to 5af3096 Compare September 3, 2025 17:38
Be clearer about which fields of the physicalInfos parameter are
relevant edits, and which are clearly not an input to the operation.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This is not _exactly_ related to the "toc", but it is in the same general
area of "data that can, and needs to be, used by code that has no other dependencies
on zstd:chunked", so this proposes to reuse the existing subpackage.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Fixes containers/skopeo#2686 .

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
We hard-code the contents to be the gzipped form, so ensure we also
use a gzip MIME type.

To make the test more explicit / representative, use the uncompressed
MIME type for non-empty layers in physicalInfos.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac mtrmac force-pushed the storage-layer-annotations branch from 5af3096 to f30d961 Compare September 8, 2025 19:11
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM
@giuseppe PTAL

Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

/lgtm

@Luap99
Copy link
Member

Luap99 commented Sep 9, 2025

@giuseppe we don't have the merge bot active here, need to manually merge.

@Luap99 Luap99 merged commit b6b19c0 into containers:main Sep 9, 2025
36 checks passed
@mtrmac mtrmac deleted the storage-layer-annotations branch September 9, 2025 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
image Related to "image" package storage Related to "storage" package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

skopeo 1.20.0 not copying layers.annotations when copying from containers-storage: to docker://
3 participants