diff options
| author | Anca Iordache <aiordache@users.noreply.github.com> | 2021-02-24 16:39:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-24 16:39:55 +0100 |
| commit | d09fe8d22578f7dc2ac2e6dceb343ac1b0c8497a (patch) | |
| tree | 25d1e9f2050c733e11b8362c36d6ff9b12edb173 | |
| parent | 69087ab977c35f89f51a4117e5c88c07cfbae3d3 (diff) | |
| parent | 43ca2f8ff958cc29d66ef6badae8121b81ee3434 (diff) | |
| download | docker-py-d09fe8d22578f7dc2ac2e6dceb343ac1b0c8497a.tar.gz | |
Merge pull request #2778 from aiordache/openssl_mismatch_bug
Drop LD_LIBRARY_PATH env var for SSH shellout
| -rw-r--r-- | docker/transport/sshconn.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/transport/sshconn.py b/docker/transport/sshconn.py index fbfdf41..a761ef5 100644 --- a/docker/transport/sshconn.py +++ b/docker/transport/sshconn.py @@ -53,9 +53,15 @@ class SSHSocket(socket.socket): signal.signal(signal.SIGINT, signal.SIG_IGN) preexec_func = f + env = dict(os.environ) + + # drop LD_LIBRARY_PATH and SSL_CERT_FILE + env.pop('LD_LIBRARY_PATH', None) + env.pop('SSL_CERT_FILE', None) + self.proc = subprocess.Popen( ' '.join(args), - env=os.environ, + env=env, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE, |