Skip to content

fix: avoid unneccesary temporary layout during build --oci (release-4.1) #3032

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 1 commit into from
Jun 20, 2024

Conversation

cstangeyanez
Copy link
Contributor

cherry pick #2936

With #2935 in place we can now translate a Docker archive tarball into an OCI-SIF without creating a redundant copy of the image as a temporary OCI layout.

We've previously been processing the buildkit tarball as an oci-archive, which still requires extraction to a temporary layout, as ggcr's tarball package doesn't accept an archived layout without a manifest.json.

Because the buildkit output tarball includes the Docker specific manifest.json, in addition to the standard OCI layout files, it can be treated as a docker-archive - now avoiding the need for the temporary layout.

Significantly reduces disk space needed by build --oci, and the associated I/O.

Fixes #2308

With sylabs#2935 in place we can now translate a Docker archive tarball into
an OCI-SIF without creating a redundant copy of the image as a temporary
OCI layout.

We've previously been processing the buildkit tarball as an oci-archive,
which still requires extraction to a temporary layout, as ggcr's tarball
package doesn't accept an archived layout without a manifest.json.

Because the buildkit output tarball includes the Docker specific
manifest.json, in addition to the standard OCI layout files, it can be
treated as a docker-archive - now avoiding the need for the temporary
layout.

Significantly reduces disk space needed by `build --oci`, and the
associated I/O.

Fixes sylabs#2308
@cstangeyanez cstangeyanez added this to the Singularity CE 4.1.4 milestone Jun 20, 2024
@cstangeyanez cstangeyanez mentioned this pull request Jun 20, 2024
4 tasks
Copy link
Member

@dtrudg dtrudg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

e2e failures from ubuntu / canonical outage only. Will merge with failed CI.

@dtrudg dtrudg merged commit 5b2f923 into sylabs:release-4.1 Jun 20, 2024
1 check failed
@cstangeyanez cstangeyanez deleted the pick2936 branch June 28, 2024 14:11
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