Skip to content

fix: avoid unneccesary temporary layout during build --oci #2936

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
May 21, 2024

Conversation

dtrudg
Copy link
Member

@dtrudg dtrudg commented May 20, 2024

Description of the Pull Request (PR):

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 theassociated I/O.

This fixes or addresses the following GitHub issues:

Before submitting a PR, make sure you have done the following:

@dtrudg dtrudg added this to the SingularityCE 4.2.0 milestone May 20, 2024
@dtrudg dtrudg self-assigned this May 20, 2024
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
@dtrudg dtrudg marked this pull request as ready for review May 21, 2024 14:16
Copy link
Contributor

@wobito wobito left a comment

Choose a reason for hiding this comment

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

D'oh missed that the first time

@dtrudg dtrudg merged commit e52e92b into sylabs:main May 21, 2024
1 check passed
@dtrudg dtrudg deleted the issue-2308 branch May 21, 2024 14:26
@dtrudg dtrudg mentioned this pull request Jun 20, 2024
4 tasks
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.

remove redundant intermediate images in build --oci flow
2 participants