Commit Graph

342 Commits (46d6bead71caca4af52671ce3532f65f407312f6)

Author SHA1 Message Date
chouseknecht af8eabe06f Fix #3941 9 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>
9 years ago
chouseknecht b9b727f435 Fix #16211 - only stop/kill running containers 9 years ago
Chris Houseknecht 964d9b3a6d Fix #3906 - Enforce required minimum compose version. (#3925)
* Fix #3906 - Require minimum compose version.

* Fix typo in message text.
9 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.
9 years ago
chouseknecht 68151790c2
Fix issue #3866 9 years ago
chouseknecht d43a91c627 Fix #147 automatically expose published ports 9 years ago
chouseknecht 67432709a4
Remove unused method in ContainerManager 9 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
9 years ago
chouseknecht 09fe0416b6 Fix #3822 stop container 9 years ago
Mike Mars 1c63fb754d Fixing Docker compile time errors irt exception handling for Python 3 9 years ago
chouseknecht a676d9e126 Remove registery option per #3824. 9 years ago
chouseknecht 4ded9313b7 Fix upate typo and expected volume compare. 9 years ago
chouseknecht e2d8d9d09a Fixed binds and volumes. Now recognizes bound vs unbound as well as named volumes. 9 years ago
Jirayut 'Dear' Nimsaeng 1212e2ed25 Fix volume to support not binding volumes to host 9 years ago
chouseknecht e8db7fd8cc
Remove debug/register from examples. 9 years ago
chouseknecht 0601df8c70
Fix network comparison. Fix handling of links. Updated doc strings. Added more examples. 9 years ago
chouseknecht d9c751be16
Set version added to 2.2 so that tests pass 9 years ago
chouseknecht 78019e4388
For new options move vesion_added to 2.1.1 9 years ago
chouseknecht 633e11be1e
Fixed bug in _get_network_id 9 years ago
chouseknecht 6d9de1b5a1 Fix doc strings. 9 years ago
chouseknecht 3292121e6d
Fixed issues post testing. 9 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. 9 years ago
chouseknecht 23816c9c04 Fix for 3768 - adding support for env_file 9 years ago
Chris Houseknecht 4d8f7d161b Merge pull request #3776 from danschmidt5189/fix-docker_container-typo
Fix "ansbile_facts" typo in docker_container module
9 years ago
chouseknecht cba5b37c9f
Check self.parameters.env exists. 9 years ago
chouseknecht c419d351c5 Fix for issue #3775 - env config comparison 9 years ago
chouseknecht 651133469c
Update restart_policy doc strings. 9 years ago
chouseknecht 6aa4feb459
Fix restart_poicy 9 years ago
chouseknecht af0aa8247d
Fix for #3783 - command returns not found or does not exist. 9 years ago
Dan Schmidt 31d21efbc5 Fix "ansbile_facts" typo in docker_container module 9 years ago
chouseknecht 904d947172 Fix for issue 3740. Make docker_service more resilient when targeting older API versions. 9 years ago
Brian Coca d8b67bdeb0 deprecated docker (#3710)
* deprecated docker

* updated formatting
9 years ago
chouseknecht a8bf8260aa
Fixed the URL in description. It's now valid Yaml. 9 years ago
chouseknecht 3d43ccae1e
Remove the U(). 9 years ago
chouseknecht fe45ec9d9e
Uppercase 9 years ago
chouseknecht 10ee35ff26
Make the new bits a NOTE 9 years ago
chouseknecht 1825a73c40
Where to get the full docker picture. 9 years ago
Shubham 64b104ac37 remove module argument, fix #3682 (#3683) 9 years ago
Matt Martz 9b6a7eb4f9 Revert "Fix doc strings spacing."
This reverts commit 127d518011.
9 years ago
chouseknecht 127d518011
Fix doc strings spacing. 9 years ago
chouseknecht a81d0a6809
Fix doc strings. Missing requirements and doc fragment reference. 9 years ago
chouseknecht d63bc38481
Fail gracefully when build path is not found. 9 years ago
chouseknecht 3a5dd00076
Fixed files/project_files naming. Correct name is files. 9 years ago
chouseknecht 22853efeed
Flip version added back to 2.2 to make tests pass. 9 years ago
chouseknecht 834d2fb9fe
Moving version added to 2.1 9 years ago
chouseknecht 282b2d45df
Added actions to RETURN docs. Show actions when debug or check mode. 9 years ago
chouseknecht c2d2189274
Removed use of --diff. Replaced 'diff' in output with 'actions'. Only show 'actions' in output if debug true. 9 years ago
chouseknecht f69b352341 Removed fail method. Combined recreate and force_recreate params. 9 years ago
chouseknecht d9b026dcef Adding docker_service 9 years ago