move container_mount into library; support mpp-resolve for org.osbuild.containers-storage#2222
Merged
supakeen merged 5 commits intoosbuild:mainfrom Oct 23, 2025
Merged
Conversation
17f7859 to
89ddc5a
Compare
Member
|
(rebased because I would like all PRs to have b6c011a so I can finish my key rotation task) |
91321b6 to
ad65cf2
Compare
Contributor
Author
😍 |
dustymabe
added a commit
to dustymabe/coreos-assembler
that referenced
this pull request
Oct 17, 2025
This backports osbuild/osbuild#2222 which will allow us to drop at least one skopeo copy to help speed things up.
achilleas-k
approved these changes
Oct 20, 2025
Member
achilleas-k
left a comment
There was a problem hiding this comment.
Thanks. LGTM. Small comment about the unit test.
Also, the third commit message (osbuild/util/containers.py: drop copy when using containers-storage i…) is too long.
Can you shrink it to < 72 chars?
You can just use osbuild/util: ... in the commit messages to refer to the module.
ad65cf2 to
41ea9a1
Compare
Contributor
Author
|
fixed the length of the commit message title to be < 72 chars |
supakeen
approved these changes
Oct 21, 2025
Contributor
Author
|
The shutzbot errors along the lines of: seem unrelated to this PR. The previous push in this PR passed tests and the last push was just a commit message update (no content change) so I'd say it's safe to push. |
41ea9a1 to
0734092
Compare
Member
|
CI is probably failing because #2223 needs to land first; I'll babysit and rebase after that gets in. |
dustymabe
added a commit
to coreos/coreos-assembler
that referenced
this pull request
Oct 22, 2025
This backports osbuild/osbuild#2222 which will allow us to drop at least one skopeo copy to help speed things up.
As prep for a later patch this moves the container image mounting code from stages/org.osbuild.container-deploy into the containers library. This commit also removes the associated unit test since it wasn't doing much and also there doesn't seem to be a place for unit testing osbuild/util/containers.py.
This is really a name and not a tag (it doesn't include :tag) so let's rename the variable to be a little more clear.
If we are just mounting the container then there's really no reason we can't just `podman mount` it directly rather than copying it from one local containers-storage to another.
The original reason to implement this for org.osbuild.container-deploy was because we were doing `skopeo copy` from one containers-storage instance to another and we needed the option if the container was signed. With the most recent commit to container_mount in containers.py we don't actually ever skopeo copy from one containers-storage instance to another, but rather `podman mount` directly, so we should be able to drop this option. Context in: - containers/container-libs#197 - osbuild/bootc-image-builder#681 - osbuild#1906
0734092 to
368994b
Compare
dustymabe
added a commit
to dustymabe/coreos-assembler
that referenced
this pull request
Oct 23, 2025
Now that osbuild/osbuild#2222 merged we can update these patches with the actual commit IDs from the upstream code base.
dustymabe
added a commit
to dustymabe/coreos-assembler
that referenced
this pull request
Oct 23, 2025
Now that osbuild/osbuild#2222 merged we can update these patches with the actual commit IDs from the upstream code base.
dustymabe
added a commit
to coreos/coreos-assembler
that referenced
this pull request
Oct 23, 2025
Now that osbuild/osbuild#2222 merged we can update these patches with the actual commit IDs from the upstream code base.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See individual commit messages.
The biggest win here is being able to skip the (currently required)
skopeo copywhen using aorg.osbuild.containers-storageinput for theorg.osbuild.container-deploystage.