Skip to content

Fix docker style cert loading.#5186

Merged
estesp merged 1 commit intocontainerd:masterfrom
cpuguy83:fix_docker_cert_loading
Mar 15, 2021
Merged

Fix docker style cert loading.#5186
estesp merged 1 commit intocontainerd:masterfrom
cpuguy83:fix_docker_cert_loading

Conversation

@cpuguy83
Copy link
Copy Markdown
Member

The certs dir parsing was skipping over files instead of reading them,
as such the certs would never load.

It was also stating the file name rather than the full path for cert
pairs.


This takes the first commit from #4978 so that it can be merged separate from that PR.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Mar 12, 2021

Build succeeded.

Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM but a nit

Comment thread remotes/docker/config/hosts_test.go Outdated
The certs dir parsing was skipping over files instead of reading them,
as such the certs would never load.

It was also stating the file name rather than the full path for cert
pairs.

Signed-off-by: Brian Goff <[email protected]>
@cpuguy83 cpuguy83 force-pushed the fix_docker_cert_loading branch from 0fbd9bd to 1fd99e2 Compare March 12, 2021 22:43
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Mar 12, 2021

Build succeeded.

@thaJeztah thaJeztah added this to the 1.5 milestone Mar 15, 2021
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit bd4f468 into containerd:master Mar 15, 2021
@cpuguy83 cpuguy83 deleted the fix_docker_cert_loading branch February 5, 2023 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants