image/docker: use unified configfile search for cert directories#746
Open
jankaluza wants to merge 1 commit intocontainers:mainfrom
Open
image/docker: use unified configfile search for cert directories#746jankaluza wants to merge 1 commit intocontainers:mainfrom
jankaluza wants to merge 1 commit intocontainers:mainfrom
Conversation
github-actions
Bot
added
storage
Luap99
reviewed
Apr 8, 2026
Member
Author
|
@Luap99 , thanks for the review :-). I will change the code once we finish discussions for all the suggested changes. |
mtrmac
reviewed
Apr 9, 2026
Contributor
mtrmac
left a comment
mtrmac
left a comment
There was a problem hiding this comment.
(Just a random note for now)
Luap99
added
the
podman 6
Luap99
reviewed
Apr 27, 2026
Member
Luap99
left a comment
Luap99
left a comment
There was a problem hiding this comment.
With the latest GetSearchPaths() API do we even get anything new from this ContainersResourceDirs?
I guess the simple thing is to just reuse GetSearchPaths() and not do any pkg/configfile changes?
Member
Author
|
@Luap99 , I rewrote it to use GetSearchPaths, but I had to introduce File.ExtraDropInDirectories to inject the /etc/docker/certs.d between XDG directories and /etc directories. |
Luap99
reviewed
Apr 28, 2026
mtrmac
reviewed
Apr 28, 2026
Contributor
mtrmac
left a comment
mtrmac
left a comment
There was a problem hiding this comment.
Looks reasonable overall.
Switch `dockerCertDir` to use the `configfile.GetSearchPaths` for resolving certificate directories. New `ExtraDropInDirectories` is introduced to add extra drop-in directory after XDG and before admin override. Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
Member
Author
|
Podman and buildah tests with this PR applied: |
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
3 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.
Switch
dockerCertDirto use the newconfigfile.ContainersResourceDirsfor resolving certificate directories.