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

Vendor c/common:9d025e4cb348 #5710

Merged
merged 1 commit into from
Sep 3, 2024

Conversation

Honny1
Copy link
Member

@Honny1 Honny1 commented Aug 30, 2024

This PR vendor pre-release version of c/common:9d025e4cb348 fixes containers/podman#23331. It also adapts the code to the new c/common/libimage API.

What type of PR is this?

In pre-release version of c/common is fixed flake containers/podman#23331. This fix changes API of c/common. So it needs adapt the code to the new c/common/libimage API. And avoid unexpected issue for next vendor dance.

/kind flake

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Fixes containers/podman#23331

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

Copy link
Contributor

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

Oops, I’m afraid I didn’t think to look at the Buildah CLI for users (I was assuming that the Buildah code vendored into Podman would cover all of the Buildah codebase).


  • It’s … not entirely clear to me that buildah images --filter … singleImageName is expected. But the old code did implement that, so making an effort might make sense.
  • Reading how args is treated, it always has either 0 or 1 elements. So, I think we don’t really need an imagesByNames set; if we have a single name to look up, deal with that one name.

cmd/buildah/images.go Outdated Show resolved Hide resolved
cmd/buildah/images.go Outdated Show resolved Hide resolved
@Honny1 Honny1 marked this pull request as ready for review September 2, 2024 13:26
@Honny1 Honny1 requested a review from mtrmac September 2, 2024 13:31
Copy link
Contributor

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

/lgtm

Thanks!

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

@Luap99
Copy link
Member

Luap99 commented Sep 3, 2024

@Honny1 can you rebase this, looks like there is merge conflict now

@Luap99
Copy link
Member

Luap99 commented Sep 3, 2024

Looks like I do not have approve power here either.

@openshift-ci openshift-ci bot removed the lgtm label Sep 3, 2024
@Honny1
Copy link
Member Author

Honny1 commented Sep 3, 2024

@Luap99 I made a rebase.

@mtrmac
Copy link
Contributor

mtrmac commented Sep 3, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 3, 2024
@rhatdan
Copy link
Member

rhatdan commented Sep 3, 2024

/approve

Copy link
Contributor

openshift-ci bot commented Sep 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Honny1, Luap99, rhatdan

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

The pull request process is described 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

@openshift-ci openshift-ci bot added the approved label Sep 3, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit f56150a into containers:main Sep 3, 2024
39 checks passed
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Dec 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

race: completion: Top layer ... not found ... storage may be corrupted
4 participants