Commit Graph

365 Commits (170ffeb896bbf083aaa865950081144c72e7486a)

Author SHA1 Message Date
Chris Houseknecht 1058094b64 Fix module failing when no ports are exposed 8 years ago
jjshoe 90b8281a51 Fixed a typo (#4168) 8 years ago
Chris Houseknecht 73dbb744b5 Merge pull request #3887 from Jorge-Rodriguez/docker-image-no-push-on-load
Don't forcibly push loaded images to registry.
8 years ago
Chris Houseknecht 328f047fda Merge pull request #4040 from qiluo-msft/qiluo/actual_stdin_open
Fix getting actual_stdin_open
8 years ago
Chris Houseknecht 4aee56553f
Fix multi-interface port binding. 8 years ago
Chris Houseknecht 9c88c45dd2 Merge pull request #4155 from chouseknecht/fix_4091
Support publishing all ports.
8 years ago
Chris Houseknecht e51024c84d Fix 'all' option for published_ports parameter. 8 years ago
Chris Houseknecht 36ed0ad766 Add cleanup parameter. (#4144) 8 years ago
Chris Houseknecht 78f6c7e51e
Fix purge_networks 8 years ago
Qi Luo 93e502f019 Fix getting actual_stdin_open 8 years ago
Chris Houseknecht 75d167e34f Merge pull request #3994 from chouseknecht/fix_ulimit
Fix ulimit comparison
8 years ago
chouseknecht 7f97cf4d04
Fix compose_version error. Check has compose before checking version. 8 years ago
chouseknecht 34305ded28 Fix index 8 years ago
chouseknecht 5f9f1642bc
Fix ulimit comparison 8 years ago
Hagen Kuehn a5fdd8c128 fixed unknown type <type 'list'> error (#3959) 8 years ago
Chris Houseknecht 0802569af9 Merge pull request #3894 from stefanha/docker_image-load_image-streaming
Stream image data in load_image() to avoid out-of-memory
8 years ago
Chris Houseknecht 0098dc322f Merge pull request #3535 from picpicpic/devel
fixes dns type in docker module
8 years ago
chouseknecht d988187860
Remove dns from container create parameters. 8 years ago
chouseknecht 0884a942bf Fix #3945 docker_container detach not waiting on container to execute. 8 years ago
chouseknecht af8eabe06f Fix #3941 8 years ago
Stefan Hajnoczi 8254e2b547 docker_service: make PyYAML requirement explicit
The "Developing Modules" documentation states:

  Include a minimum of dependencies if possible. If there are
  dependencies, document them at the top of the module file, and have
  the module raise JSON error messages when the import fails.

When docker_service runs on a remote host without PyYAML it crashes with
ImportError.

This patch raises a JSON error message when import fails, but only if
the PyYAML module is actually used.  It's only needed when the
"definition" parameter is given.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
8 years ago
chouseknecht b9b727f435 Fix #16211 - only stop/kill running containers 8 years ago
Chris Houseknecht 964d9b3a6d Fix #3906 - Enforce required minimum compose version. (#3925)
* Fix #3906 - Require minimum compose version.

* Fix typo in message text.
8 years ago
Stefan Hajnoczi 47cc422b8a Stream image data in load_image() to avoid out-of-memory
Reading the entire tar file into memory can result in out-of-memory
conditions such as this traceback:

Traceback (most recent call last):
  File "/tmp/ansible_YELTSu/ansible_module_docker_image.py", line 486, in load_image
    self.client.load_image(image_data)
  File "/usr/local/lib/python2.7/dist-packages/docker/api/image.py", line 147, in load_image
    res = self._post(self._url("/images/load"), data=data)
  ...
  File "/usr/lib/python2.7/httplib.py", line 997, in endheaders
    self._send_output(message_body)
  File "/usr/lib/python2.7/httplib.py", line 848, in _send_output
    msg += message_body
MemoryError

Luckily docker-py's load_image(), which calls requests post(), accepts a
file-like object instead of a string.  Pass in the file object to avoid
reading the full file into memory.  This allows larger tar files to load
succesfully.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
8 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.
8 years ago
Rodríguez, Jorge 7d33c6ccdf Do not forcibly push when building, either. 8 years ago
Rodríguez, Jorge a0be466f90 Don't forcibly push loaded images to registry. Fixes #3763 8 years ago
chouseknecht 68151790c2
Fix issue #3866 8 years ago
chouseknecht d43a91c627 Fix #147 automatically expose published ports 8 years ago
chouseknecht 67432709a4
Remove unused method in ContainerManager 8 years ago
Chris Houseknecht 0a42ada42a Merge pull request #3844 from Hypermanzer/docker-python-3-compat-bug
Fixing Docker compile time errors irt exception handling for Python 3
8 years ago
chouseknecht 09fe0416b6 Fix #3822 stop container 8 years ago
Mike Mars 1c63fb754d Fixing Docker compile time errors irt exception handling for Python 3 8 years ago
chouseknecht a676d9e126 Remove registery option per #3824. 8 years ago
chouseknecht 4ded9313b7 Fix upate typo and expected volume compare. 8 years ago
chouseknecht e2d8d9d09a Fixed binds and volumes. Now recognizes bound vs unbound as well as named volumes. 8 years ago
Jirayut 'Dear' Nimsaeng 1212e2ed25 Fix volume to support not binding volumes to host 8 years ago
chouseknecht e8db7fd8cc
Remove debug/register from examples. 8 years ago
chouseknecht 0601df8c70
Fix network comparison. Fix handling of links. Updated doc strings. Added more examples. 8 years ago
chouseknecht d9c751be16
Set version added to 2.2 so that tests pass 8 years ago
chouseknecht 78019e4388
For new options move vesion_added to 2.1.1 8 years ago
chouseknecht 633e11be1e
Fixed bug in _get_network_id 8 years ago
chouseknecht 6d9de1b5a1 Fix doc strings. 8 years ago
chouseknecht 3292121e6d
Fixed issues post testing. 8 years ago
chouseknecht 8cd028bd8e First pass at implementing networks parameter. Also added purge_networks option to remove container from networks not included in networks param. 8 years ago
chouseknecht 23816c9c04 Fix for 3768 - adding support for env_file 8 years ago
Chris Houseknecht 4d8f7d161b Merge pull request #3776 from danschmidt5189/fix-docker_container-typo
Fix "ansbile_facts" typo in docker_container module
8 years ago
chouseknecht cba5b37c9f
Check self.parameters.env exists. 8 years ago
chouseknecht c419d351c5 Fix for issue #3775 - env config comparison 8 years ago
chouseknecht 651133469c
Update restart_policy doc strings. 8 years ago