Skip to content

make the DOCKER_TLS_VERIFY environment align with docker CLI #992

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

make the DOCKER_TLS_VERIFY environment align with docker CLI #992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions docker/utils/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,13 +457,8 @@ def kwargs_from_env(ssl_version=None, assert_hostname=None):

# empty string for tls verify counts as "false".
# Any value or 'unset' counts as true.
tls_verify = os.environ.get('DOCKER_TLS_VERIFY')
if tls_verify == '':
tls_verify = False
enable_tls = True
else:
tls_verify = tls_verify is not None
enable_tls = cert_path or tls_verify
tls_verify = os.environ.get('DOCKER_TLS_VERIFY') or False
enable_tls = tls_verify or cert_path or False

params = {}

Expand Down