tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6012 from docker/5930-credstore-ldpath 

Use original LD_LIBRARY_PATH when shelling out to credential stores
This commit is contained in:
Joffrey F 2018-06-18 17:05:37 -07:00 committed by GitHub
parent f0674be578 c187d3c39f
commit 7f0734ca3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compose/cli/docker_client.py
View File

@ -117,6 +117,13 @@ def docker_client(environment, version=None, tls_config=None, host=None,
kwargs['user_agent'] = generate_user_agent() kwargs['user_agent'] = generate_user_agent()
# Workaround for
# https://pyinstaller.readthedocs.io/en/v3.3.1/runtime-information.html#ld-library-path-libpath-considerations
if 'LD_LIBRARY_PATH_ORIG' in environment:
kwargs['credstore_env'] = {
'LD_LIBRARY_PATH': environment.get('LD_LIBRARY_PATH_ORIG'),
}
client = APIClient(**kwargs) client = APIClient(**kwargs)
client._original_base_url = kwargs.get('base_url') client._original_base_url = kwargs.get('base_url')