Commit graph

7 commits

Author SHA1 Message Date
chouseknecht
48941291c1
Fix container labels expected vs actual comparison. 2016-08-27 08:00:13 -04:00
PikachuEXE
997fa3b2b7 Allow specifying human readable value for option memory_limit again (#4049) 2016-08-16 08:44:24 -04:00
Qi Luo
93e502f019 Fix getting actual_stdin_open 2016-06-24 18:58:21 -07:00
Chris Houseknecht
0098dc322f Merge pull request #3535 from picpicpic/devel
fixes dns type in docker module
2016-06-13 18:28:18 -04:00
Vince v. Oosten
fd418c19c2 move environment variable gathering to end of __init__() (#3890)
* This moves the lines in the code that parse the `env` and `env_file` options for docker to the end of the `__init__()` function.
This is needed because the `_check_capabilites` function needs both a working `self.client` and a proper `self.docker_py_versioninfo`.
`_check_capabilities` is used by `ensure_capabilities` which is, in turn, used by `get_environment`

This means that before this commit, the environment variables could not be loaded because both `self.client` and `self.docker_py_versioninfo` were not set at that time.

This commit fixes that by putting the environment variable parsing after those two.

* This moves the lines in the code that parse the `env` and `env_file` options for docker to the end of the `__init__()` function.
This is needed because the `_check_capabilites` function needs both a working `self.client` and a proper `self.docker_py_versioninfo`.
`_check_capabilities` is used by `ensure_capabilities` which is, in turn, used by `get_environment`

This means that before this commit, the environment variables could not be loaded because both `self.client` and `self.docker_py_versioninfo` were not set at that time.

This commit fixes that by putting the environment variable parsing after those two.
2016-06-08 09:39:34 -04:00
pic
fee0055f9f fix #3528 : dns type 2016-05-28 12:41:21 +02:00
Brian Coca
d8b67bdeb0 deprecated docker (#3710)
* deprecated docker

* updated formatting
2016-05-25 15:08:45 -04:00
Renamed from cloud/docker/docker.py (Browse further)