8000 Merge the v5.34.3 tag into the main branch by mtrmac · Pull Request #2810 · containers/image · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Merge the v5.34.3 tag into the main branch #2810

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

Merged
merged 7 commits into from
Mar 27, 2025
Merged

Conversation

mtrmac
Copy link
Collaborator
@mtrmac mtrmac commented Mar 27, 2025

… so that users who vendor a commit from the main branch don’t have to downgrade.

@TomSweeneyRedHat @Luap99 PTAL

mtrmac and others added 7 commits March 10, 2025 17:14
…/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>
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, 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.

@mtrmac
Copy link
Collaborator Author
mtrmac commented Mar 27, 2025

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.

@mtrmac mtrmac merged commit d3b2412 into containers:main Mar 27, 2025
10 checks passed
@mtrmac mtrmac deleted the into-main branch March 27, 2025 19:35
@TomSweeneyRedHat
Copy link
Member

I'm late to the party, but LGTM, FWIW.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0