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.

Sign up for GitHub

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
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
- Avoid unnecessary copying / extraction of OCI images and Docker tarballs into
a layout directory when they are directly accessible as a local file /
directory.
- Avoid unnecessary intermediate temporary image layout when building from
Dockerfile to OCI-SIF.

## 4.1.3 \[2024-05-08\]

Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/build/buildkit/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func Run(ctx context.Context, opts *Opts, dest, spec string) error {
}
pullOpts.Platform = *platform
}
if _, err := ocisif.PullOCISIF(ctx, nil, dest, "oci-archive:"+tarFile.Name(), pullOpts); err != nil {
if _, err := ocisif.PullOCISIF(ctx, nil, dest, "docker-archive:"+tarFile.Name(), pullOpts); err != nil {
return fmt.Errorf("while converting OCI tar image to OCI-SIF: %w", err)
}

Expand Down