Commit Graph

8 Commits (f5658f4e5048ae6f2cf1d8eb434be3602fc6bb3a)

Author SHA1 Message Date
jctanner 2de97ac5bd replace type() with isinstance() (#5541)
Replace all use of type() with isintance()

Addresses https://github.com/ansible/ansible/issues/18310
9 years ago
chouseknecht 48941291c1
Fix container labels expected vs actual comparison. 10 years ago
PikachuEXE 997fa3b2b7 Allow specifying human readable value for option `memory_limit` again (#4049) 10 years ago
Qi Luo 93e502f019 Fix getting actual_stdin_open 10 years ago
Chris Houseknecht 0098dc322f Merge pull request #3535 from picpicpic/devel
fixes dns type in docker module
10 years ago
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.
10 years ago
pic fee0055f9f fix #3528 : dns type 10 years ago
Brian Coca d8b67bdeb0 deprecated docker (#3710)
* deprecated docker

* updated formatting
10 years ago