move registries.conf into drop in directory#2525
Merged
Merged
Conversation
Follow up to[1], with the packaging changes for new config file work[2] we now have vendor overwrites as drop 00-vendor.conf. That file is parsed after /etc/containers/registries.conf and as such the unqualified-search-registries setting is overwritten again. To ensure the cockpit test file is parsed last put it into the drop in directory as 99-cockpit-podman-test.conf which should also help to make it clear what own/created the file. This /etc/containers/registries.conf.d directory has been supported for a while already so this works not just with podman 6 but also the previous ones making so not version logic is needed here. [1] 772987d (move registries.conf format to v2) [2] containers/container-libs#795 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Contributor
Author
|
looks like packit tests passed here so lets see if I can tests against the containers-common rpm changes |
Contributor
Author
|
/packit test containers/container-libs#795 |
Contributor
Author
that is expected as the rpm changes only work with podman. I you do not use podman-next packages then I guess we cannot test this here and it does not seem to be testable on containers/podman#28601 either. Anyhow the change here should be safe enough and you just have to trust it then I guess. |
Contributor
Author
|
/packit test |
Member
|
This indeed fixes the regression with podman-next (the upstream cockpit revdeps failures), see here. I triggered the integration tests, might be that the drop-in directory does not yet work on older releases. |
6 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow up to[1], with the packaging changes for new config file work[2] we now have vendor overwrites as drop 00-vendor.conf. That file is parsed after /etc/containers/registries.conf and as such the unqualified-search-registries setting is overwritten again.
To ensure the cockpit test file is parsed last put it into the drop in directory as 99-cockpit-podman-test.conf which should also help to make it clear what own/created the file.
This /etc/containers/registries.conf.d directory has been supported for a while already so this works not just with podman 6 but also the previous ones making so not version logic is needed here.
[1] 772987d (move registries.conf format to v2)
[2] containers/container-libs#795