Merge the v5.34.3 tag into the main branch#2810
Merged
mtrmac merged 7 commits intocontainers:mainfrom Mar 27, 2025
Merged
Conversation
…/bumptov5.34.2 [release-5.34] Bump c/storage to v1.57.2, c/image to v5.34.2
Move the layerType value closer to the code that actually knows the format. Don't allocate/initialize a sha256 state if we don't know we are going to need it. Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Correctly compute the DiffID of non-gzip-compressed layers, and if possible, set the layer MIME type correctly. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
[5.34] Correctly compute DiffID, and try to set the correct MIME type, for non-gzip input to `tarball:`
As the title says. This will start the SIC dance to eventually solve: https://issues.redhat.com/browse/RHEL-85218 and https://issues.redhat.com/browse/RHEL-85218 up in Podman for the RHEL 9.6/10.0 ZeroDay. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
Luap99
approved these changes
Mar 27, 2025
Member
Luap99
left a comment
There was a problem hiding this comment.
LGTM, I wonder if you should have a bot do these, of course there is always a merge conflict but we can tell it to always use the version from main as merge strategy I think.
Collaborator
Author
|
I think automating the release process (both on main, and on a branch), in full, would be interesting conceptually, but, also, the payoff (a few minutes once a month?) is probably not that large. We would still want careful human review and attention, and that’s the more expensive part. It’s more interesting for Podman, where there is more complexity and more steps. Maybe c/image can inherit/share a production-proven automation from elsewhere. |
Member
|
I'm late to the party, but LGTM, FWIW. |
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
3 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.
… so that users who vendor a commit from the
mainbranch don’t have to downgrade.@TomSweeneyRedHat @Luap99 PTAL