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

[WIP] Add multi manifest oci-archive support #921

Closed
wants to merge 2 commits into from

Conversation

umohnani8
Copy link
Member

@umohnani8 umohnani8 commented Feb 7, 2022

Pulling in containers/image#1381 and adding it to the load and save logic here.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 7, 2022

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: umohnani8
To complete the pull request process, please assign vrothberg after the PR has been reviewed.
You can assign the PR to them by writing /assign @vrothberg in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

Just a very quick skim. It seems the commit is reverting some previous ones.

libimage/load.go Outdated Show resolved Hide resolved
libimage/pull.go Outdated Show resolved Hide resolved
libimage/pull.go Outdated Show resolved Hide resolved
@umohnani8 umohnani8 force-pushed the multi branch 4 times, most recently from 5b1833d to c0f3141 Compare February 7, 2022 18:22
libimage/pull.go Outdated Show resolved Hide resolved
libimage/pull.go Outdated Show resolved Hide resolved
libimage/save.go Outdated Show resolved Hide resolved
libimage/save.go Show resolved Hide resolved
libimage/pull.go Outdated Show resolved Hide resolved
libimage/save.go Outdated Show resolved Hide resolved
libimage/save_test.go Outdated Show resolved Hide resolved
libimage/load_test.go Outdated Show resolved Hide resolved
libimage/save.go Show resolved Hide resolved
libimage/save.go Outdated Show resolved Hide resolved
libimage/save.go Outdated Show resolved Hide resolved
libimage/save_test.go Outdated Show resolved Hide resolved
@umohnani8 umohnani8 force-pushed the multi branch 2 times, most recently from 71a2345 to 219ab4e Compare March 1, 2022 15:12
if err != nil {
return nil, err
}
return r.copyFromOCIArchiveReader(ctx, reader, options)
Copy link
Contributor

Choose a reason for hiding this comment

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

If readerRef points at specific image, this seems to completely lose that choice.

Cc: @vrothberg . I thought the distinction is that podman pull oci-archive:… always pulls exactly the one image that c/image uses under that reference, while podman load can possibly pull all images from an archive.

(Compare also the discussion about NewReaderForReference / LoadManifestDescriptor in the c/image PR.)

Copy link
Member

Choose a reason for hiding this comment

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

Cc: @vrothberg . I thought the distinction is that podman pull oci-archive:… always pulls exactly the one image that c/image uses under that reference, while podman load can possibly pull all images from an archive.

Yes, podman pull expects one image. You can check out the behavior via podman pull docker-archive:libimage/testdata/docker-two-images.tar.xz

@umohnani8 umohnani8 force-pushed the multi branch 2 times, most recently from 302dfba to c9cd8ba Compare March 3, 2022 01:20
}
defer func() {
if err := reader.Close(); err != nil {
logrus.Errorf(err.Error())
Copy link
Contributor

Choose a reason for hiding this comment

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

.Error() is not a format string; this should be something like logrus.Errorf("%s", err.Error())

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 9, 2022

@umohnani8: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Signed-off-by: Urvashi Mohnani <[email protected]>
@mtrmac
Copy link
Contributor

mtrmac commented Oct 6, 2022

See containers/image#1381 (comment) .

@rhatdan
Copy link
Member

rhatdan commented Nov 5, 2023

Can we close this one due to lack of activity?

@umohnani8 umohnani8 closed this Nov 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants