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] Fix docker client creation by tls verify from env #829

Merged
merged 1 commit into from
Oct 29, 2021
Merged

[Fix] Fix docker client creation by tls verify from env #829

merged 1 commit into from
Oct 29, 2021

Conversation

dragonflylee
Copy link
Contributor

@dragonflylee dragonflylee commented Oct 29, 2021

Follow-Up for #674

support with TLS (via env DOCKER_TLS_VERIFY)
support with TLS (via context)

as alreay called

dockerCli.Initialize(newClientOpts)

why not use client inside dockerCli created by function Initialize

fixes #801

@iwilltry42 iwilltry42 added this to the v5.0.3 milestone Oct 29, 2021
Copy link
Member

@iwilltry42 iwilltry42 left a comment

Choose a reason for hiding this comment

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

Yes! Way cleaner ❤️

@iwilltry42
Copy link
Member

Hi @dragonflylee , I don't exactly remember how we ended up with the old code, but your changes are way cleaner, thank you! 🙂

@iwilltry42 iwilltry42 self-assigned this Oct 29, 2021
@iwilltry42 iwilltry42 merged commit 1bcf802 into k3d-io:main Oct 29, 2021
@iwilltry42
Copy link
Member

Tested with a simple script that checks both ways: context and DOCKER_* env vars: https://github.com/rancher/k3d/blob/main/tests/local_test_remote_docker.sh

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] k3d does not honor DOCKER_TLS
2 participants