Commit graph

338 commits

Author SHA1 Message Date
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
chouseknecht
68151790c2
Fix issue #3866 2016-06-04 02:07:10 -04:00
chouseknecht
d43a91c627 Fix #147 automatically expose published ports 2016-06-03 05:25:11 -04:00
chouseknecht
67432709a4
Remove unused method in ContainerManager 2016-06-03 02:10:59 -04:00
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
2016-06-03 02:05:09 -04:00
chouseknecht
09fe0416b6 Fix #3822 stop container 2016-06-03 01:54:39 -04:00
Mike Mars
1c63fb754d Fixing Docker compile time errors irt exception handling for Python 3 2016-06-02 14:30:35 -07:00
chouseknecht
a676d9e126 Remove registery option per #3824. 2016-06-02 11:43:36 -04:00
chouseknecht
4ded9313b7 Fix upate typo and expected volume compare. 2016-06-02 06:14:29 -04:00
chouseknecht
e2d8d9d09a Fixed binds and volumes. Now recognizes bound vs unbound as well as named volumes. 2016-06-01 17:05:03 -04:00
Jirayut 'Dear' Nimsaeng
1212e2ed25 Fix volume to support not binding volumes to host 2016-06-01 17:26:51 +07:00
chouseknecht
e8db7fd8cc
Remove debug/register from examples. 2016-05-31 10:33:43 -04:00
chouseknecht
0601df8c70
Fix network comparison. Fix handling of links. Updated doc strings. Added more examples. 2016-05-31 10:14:42 -04:00
chouseknecht
d9c751be16
Set version added to 2.2 so that tests pass 2016-05-30 18:48:42 -04:00
chouseknecht
78019e4388
For new options move vesion_added to 2.1.1 2016-05-30 18:39:52 -04:00
chouseknecht
633e11be1e
Fixed bug in _get_network_id 2016-05-30 18:37:28 -04:00
chouseknecht
6d9de1b5a1 Fix doc strings. 2016-05-30 15:14:14 -04:00
chouseknecht
3292121e6d
Fixed issues post testing. 2016-05-30 15:04:43 -04:00
chouseknecht
8cd028bd8e First pass at implementing networks parameter. Also added purge_networks option to remove container from networks not included in networks param. 2016-05-30 12:03:11 -04:00
chouseknecht
23816c9c04 Fix for 3768 - adding support for env_file 2016-05-29 10:27:07 -04:00
Chris Houseknecht
4d8f7d161b Merge pull request #3776 from danschmidt5189/fix-docker_container-typo
Fix "ansbile_facts" typo in docker_container module
2016-05-29 09:42:04 -04:00
chouseknecht
cba5b37c9f
Check self.parameters.env exists. 2016-05-29 09:36:17 -04:00
chouseknecht
c419d351c5 Fix for issue #3775 - env config comparison 2016-05-29 09:32:52 -04:00
chouseknecht
651133469c
Update restart_policy doc strings. 2016-05-29 08:29:52 -04:00
chouseknecht
6aa4feb459
Fix restart_poicy 2016-05-29 08:20:59 -04:00
chouseknecht
af0aa8247d
Fix for #3783 - command returns not found or does not exist. 2016-05-29 06:54:46 -04:00
Dan Schmidt
31d21efbc5 Fix "ansbile_facts" typo in docker_container module 2016-05-28 00:33:03 -07:00
chouseknecht
904d947172 Fix for issue 3740. Make docker_service more resilient when targeting older API versions. 2016-05-25 16:38:38 -04:00
Brian Coca
d8b67bdeb0 deprecated docker (#3710)
* deprecated docker

* updated formatting
2016-05-25 15:08:45 -04:00
chouseknecht
a8bf8260aa
Fixed the URL in description. It's now valid Yaml. 2016-05-19 10:00:21 -04:00
chouseknecht
3d43ccae1e
Remove the U(). 2016-05-19 09:41:11 -04:00
chouseknecht
fe45ec9d9e
Uppercase 2016-05-18 15:03:10 -04:00
chouseknecht
10ee35ff26
Make the new bits a NOTE 2016-05-18 14:35:20 -04:00
chouseknecht
1825a73c40
Where to get the full docker picture. 2016-05-18 13:34:13 -04:00
Shubham
64b104ac37 remove module argument, fix #3682 (#3683) 2016-05-17 14:36:05 -04:00
Matt Martz
9b6a7eb4f9 Revert "Fix doc strings spacing."
This reverts commit 127d518011.
2016-05-15 17:43:28 -05:00
chouseknecht
127d518011
Fix doc strings spacing. 2016-05-14 09:34:15 -04:00
chouseknecht
a81d0a6809
Fix doc strings. Missing requirements and doc fragment reference. 2016-05-14 09:13:47 -04:00
chouseknecht
d63bc38481
Fail gracefully when build path is not found. 2016-05-13 00:30:36 -04:00
chouseknecht
3a5dd00076
Fixed files/project_files naming. Correct name is files. 2016-05-12 05:31:10 -04:00
chouseknecht
22853efeed
Flip version added back to 2.2 to make tests pass. 2016-05-12 05:04:21 -04:00
chouseknecht
834d2fb9fe
Moving version added to 2.1 2016-05-12 04:44:35 -04:00
chouseknecht
282b2d45df
Added actions to RETURN docs. Show actions when debug or check mode. 2016-05-12 04:42:50 -04:00
chouseknecht
c2d2189274
Removed use of --diff. Replaced 'diff' in output with 'actions'. Only show 'actions' in output if debug true. 2016-05-11 15:01:29 -04:00
chouseknecht
f69b352341 Removed fail method. Combined recreate and force_recreate params. 2016-05-11 13:50:55 -04:00
chouseknecht
d9b026dcef Adding docker_service 2016-05-11 13:50:55 -04:00
Chris Houseknecht
f08e5608c7 Fixed parameters passing in container_create method. (#3618) 2016-05-10 17:56:57 -04:00
Brian Coca
e7d49f3308 fixed documentation and arg issues 2016-05-04 08:37:23 -04:00
Toshio Kuratomi
9db1233521 Fix documentation 2016-05-03 10:10:51 -07:00
John R Barker
bb9572ca86 ansible-validate-modules part 4: Enable check on ansible-modules-core (#3526)
* Call ansible-validate-modules

* Correct quotes + add newline
2016-05-03 07:51:12 -07:00