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

libimage.ManifestList.AnnotateInstance(): allow clearing variant values #2045

Merged
merged 1 commit into from
Jun 6, 2024

Conversation

nalind
Copy link
Member

@nalind nalind commented Jun 5, 2024

When AnnotateInstance() is given a non-empty Architecture value, set the Variant value to the one that was passed in along with it, even if that value is empty.

Fixes containers/podman#22730.

When AnnotateInstance() is given a non-empty Architecture value, set the
Variant value to the one that was passed in along with it, even if that
value is empty.

Signed-off-by: Nalin Dahyabhai <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Jun 5, 2024

/approve
LGTM

@openshift-ci openshift-ci bot added the approved label Jun 5, 2024
@rhatdan
Copy link
Member

rhatdan commented Jun 6, 2024

Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

openshift-ci bot commented Jun 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5, nalind, 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

@rhatdan
Copy link
Member

rhatdan commented Jun 6, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jun 6, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit ee0f201 into containers:main Jun 6, 2024
12 checks passed
@nalind nalind deleted the clear-variant branch June 6, 2024 14:16
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.

podman build adds "variant" to all images when building multiarch images on MacOS (Apple Silicon)
3 participants