Skip to content
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

diff: gzip with custom level should be compressed by BuildKit's differ #4275

Merged
merged 1 commit into from
Sep 25, 2023

Conversation

ktock
Copy link
Collaborator

@ktock ktock commented Sep 25, 2023

Fixes #4210 (comment)

containerd-rootless test uses containerd worker + native snapshotter. In this configuration, buildkitd relies on containred's differ via containerd client that doesn't support changing the compression level. So this doesn't produce the difference for the created blob.

With containerd worker + non-overlayfs-snapshotter configuration, we've been using containerd's differ via containerd client but the compression level can't be applied in this configuration. This commit fixes this issue by compressing gzip with customized compression level on BuildKit't differ instead of containerd's differ. Uncompressed blobs and gzip blobs without customized compression level are still handled by containerd's differ.

@ktock
Copy link
Collaborator Author

ktock commented Sep 25, 2023

The tests of #4210 pass with this PR (tested in #4276 ).

https://github.com/moby/buildkit/actions/runs/6299489743/job/17100420013?pr=4276#step:8:1259

--- PASS: TestIntegration/TestSnapshotWithMultipleBlobs/worker=containerd-rootless (9.16s)

@tonistiigi This patch will unblock PR #4210 , PTAL 🙏

@tonistiigi tonistiigi merged commit 5ed1f0b into moby:master Sep 25, 2023
@ktock ktock deleted the gzip-buildkit-differ branch September 26, 2023 00:00
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.

2 participants