Skip to content

[5.34] Correctly compute DiffID, and try to set the correct MIME type, for non-gzip input to tarball: #2807

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 3 commits into from
Mar 27, 2025

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Mar 26, 2025

This is a backport of #2795.

Marked as draft, pending a decision on whether we can include this. Cc: @TomSweeneyRedHat

mtrmac added 3 commits March 26, 2025 20:22
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>
@mtrmac mtrmac changed the base branch from main to release-5.34 March 26, 2025 19:25
@TomSweeneyRedHat
Copy link
Member

LGTM
Before merging, let's go some RHEL Jira cards setup

@TomSweeneyRedHat
Copy link
Member

@TomSweeneyRedHat TomSweeneyRedHat marked this pull request as ready for review March 27, 2025 13:21
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

@Luap99 Luap99 merged commit 6b6fd18 into containers:release-5.34 Mar 27, 2025
10 checks passed
@mtrmac mtrmac deleted the tarball-compression-5.34 branch March 27, 2025 18:27
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