Skip to content

Commit b941ad7

Browse files
committed
Merge pull request #1634 from carmstrong/client_proxy_support
feat(client): add proxy support
2 parents e4a4281 + 6e70e27 commit b941ad7

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

client/deis.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ def __init__(self):
8484
cookie_file = os.path.expanduser('~/.deis/cookies.txt')
8585
cookie_dir = os.path.dirname(cookie_file)
8686
self.cookies = MozillaCookieJar(cookie_file)
87+
self.proxies = {
88+
"http": os.getenv("http_proxy"),
89+
"https": os.getenv("https_proxy")
90+
}
8791
# Create the $HOME/.deis dir if it doesn't exist
8892
if not os.path.isdir(cookie_dir):
8993
os.mkdir(cookie_dir, 0700)

docs/using_deis/install-client.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ You can also install the latest Deis client using Python's pip_ package manager:
3535
$ deis
3636
Usage: deis <command> [<args>...]
3737
38+
Proxy Support
39+
-------------
40+
Set the ```http_proxy``` or ```https_proxy``` environment variable to enable proxy support:
41+
42+
.. code-block:: console
43+
44+
$ export http_proxy="http://proxyip:port"
45+
$ export https_proxy="http://proxyip:port"
46+
3847
Integrated Help
3948
---------------
4049
The Deis client comes with comprehensive documentation for every command.

0 commit comments

Comments
 (0)