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

fix compat image resolution #14294

Merged
merged 1 commit into from
May 24, 2022
Merged

Conversation

vrothberg
Copy link
Member

Fix a bug in the resolution of images in the Docker compat API.
When looking up an image by a short name, the name may match
an image that does not live on Docker Hub. The resolved name
should be used for normalization instead of the input name to
make sure that busybox can resolve to registry.com/busybox
if present in the local storage.

Fixes: #14291
Signed-off-by: Valentin Rothberg [email protected]

Does this PR introduce a user-facing change?

Fix a bug in the resolution of images in the Docker compat API when resolving short names for images that do not live on Docker Hub.

@openshift-ci openshift-ci bot added release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 19, 2022
@rhatdan
Copy link
Member

rhatdan commented May 19, 2022

LGTM

@vrothberg
Copy link
Member Author

@mheon, I think that's a good candidate for a v4.1 backport.

@mheon
Copy link
Member

mheon commented May 19, 2022

Sure
/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 19, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 19, 2022
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 19, 2022
@TomSweeneyRedHat
Copy link
Member

@vrothberg looks like you might need to tweak the tests further.

Fix a bug in the resolution of images in the Docker compat API.
When looking up an image by a short name, the name may match
an image that does not live on Docker Hub.  The resolved name
should be used for normalization instead of the input name to
make sure that `busybox` can resolve to `registry.com/busybox`
if present in the local storage.

Fixes: containers#14291
Signed-off-by: Valentin Rothberg <[email protected]>
@vrothberg
Copy link
Member Author

@vrothberg looks like you might need to tweak the tests further.

Should turn green now.

@vrothberg
Copy link
Member Author

Ready to get in ✔️

@rhatdan
Copy link
Member

rhatdan commented May 23, 2022

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 23, 2022
@vrothberg
Copy link
Member Author

@flouthoc can you merge?

@flouthoc
Copy link
Collaborator

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 24, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 24, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, vrothberg

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-merge-robot openshift-merge-robot merged commit 737b100 into containers:main May 24, 2022
@vrothberg vrothberg deleted the fix-14291 branch May 24, 2022 07:41
@vrothberg
Copy link
Member Author

/cherry-pick v4.1

@openshift-cherrypick-robot
Copy link
Collaborator

@vrothberg: new pull request created: #14337

In response to this:

/cherry-pick v4.1

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.

@edsantiago edsantiago added the kind/bug Categorizes issue or PR as related to a bug. label Jun 1, 2022
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 21, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Podman's Docker-compatible REST API and previously pulled images.
8 participants