Add DockerAdditionalTrustedBundle for custom CAs #595
Conversation
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
Introduces a new SystemContext field DockerAdditionalTrustedBundle to allow callers to provide additional PEM-encoded certificates that should be trusted when connecting to Docker registries. This is useful for environments with custom or internal certificate authorities, particularly when host-specific certificates are provided but a common CA is required across all hosts. Signed-off-by: Pablo Rodriguez Nava <git@amail.pablintino.com>
podmanbot
pushed a commit
to podmanbot/buildah
that referenced
this pull request
Jan 16, 2026
|
✅ A new PR has been created in buildah to vendor these changes: containers/buildah#6642 |
mtrmac
reviewed
Jan 21, 2026
Contributor
mtrmac
left a comment
mtrmac
left a comment
There was a problem hiding this comment.
Thanks!
There is a parallel TLS setting discussion motivated by OpenShift needs, so this needs to be coordinated with that — probably land afterwards or at the very least it needs to not prevent the other work.
| } | ||
|
|
||
| // If the non-host-specific trust bundle is given add it to the RootCAs pool | ||
| if sys.DockerAdditionalTrustedBundle != "" { |
|
|
||
| // If the non-host-specific trust bundle is given add it to the RootCAs pool | ||
| if sys.DockerAdditionalTrustedBundle != "" { | ||
| tlsClientConfig.RootCAs.AppendCertsFromPEM([]byte(sys.DockerAdditionalTrustedBundle)) |
Contributor
There was a problem hiding this comment.
I wonder whether the input wouldn’t be better as native Go Certificate, not forcing the client to serialize to text if the input is not originally text.
I don’t have a strong opinion at this point.
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.
Summary
Adds
DockerAdditionalTrustedBundlefield toSystemContextfor providing additional PEM-encoded CA certificates when connecting to Docker registries.Use case
Useful when host-specific certificates are configured but a common CA is needed across all registry connections.
Changes
DockerAdditionalTrustedBundlefield toSystemContextRootCAspool innewDockerClient()