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
Rodríguez, Jorge
7d33c6ccdf
Do not forcibly push when building, either.
2016-06-08 11:45:39 +03:00
Rodríguez, Jorge
a0be466f90
Don't forcibly push loaded images to registry. Fixes #3763
2016-06-08 11:43:27 +03: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
pic
fee0055f9f
fix #3528 : dns type
2016-05-28 12:41:21 +02: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
chouseknecht
a9ab2e1142
Add doc string for container_limits. Fixed push fail message. Use path type.
2016-04-29 00:39:08 -04:00
Chris Houseknecht
35c589575d
Adding docker_image_facts ( #3493 )
...
* Adding docker_image_facts
* Fix github credentials
2016-04-27 17:43:44 -04:00
Chris Houseknecht
f6344b6dc7
Adding docker_container ( #3495 )
...
* Adding docker_container
* If state absent, stop the container before attempting to remove. Fixed status running check.
* If container absent, stop before removing. Fix container status check.
2016-04-27 17:43:26 -04:00
Toshio Kuratomi
22ce32dd93
Fix docs building
2016-04-27 10:40:38 -07:00
Toshio Kuratomi
f3fef24e49
Some beginning python3 porting for modules which have unittests
2016-04-27 07:17:05 -07:00
chouseknecht
1d2be97013
Updated version_added on options to reflect options added for 2.1.
2016-04-25 15:22:44 -04:00
chouseknecht
e888abbcb0
Clean up and fixes post API version 1.20 testing.
2016-04-25 15:12:28 -04:00
chouseknecht
6eba1d6fb3
Fix github credentials
2016-04-25 15:11:48 -04:00
chouseknecht
009b02e928
Fix unfriendly exeption handling.
2016-04-25 15:11:48 -04:00
chouseknecht
39fdd2358e
Updater per PR comments
2016-04-25 15:11:48 -04:00
chouseknecht
7a1eea2767
Adding refactored docker_image module.
2016-04-25 15:11:48 -04:00
Chris Houseknecht
ec5515edcf
Adding docker_login ( #3494 )
...
* Adding docker_login
* Set correct version_added.
* Fix github credentials
2016-04-25 10:19:54 -04:00
Darek Kaczyński
f7c32e2b5e
Fix for 'cannot unmarshal array into Go value of type string' error about HostConfig Binds ( #3496 )
2016-04-22 21:05:16 -04:00
ThomasSteinbach
8dc0276533
docker: fix type issue ( #3491 )
...
* fix type issue
* fix type issue for 'volumes-from'
2016-04-21 13:28:26 +02:00
Alexey Wasilyev
1c3071af61
docker: support polling image by digest ( #2932 )
2016-04-16 21:46:02 +02:00
Fabian von Feilitzsch
edc8698c14
make binds a list instead of a dict (to prevent overwriting when copying the same file to two places) ( #2294 )
2016-04-12 22:01:45 +02:00
René Moser
13f4b40c15
Merge pull request #3284 from mscherer/fix_docker_args
...
Improve/fix type checking for docker module
2016-03-25 23:43:52 +01:00
Ash Wilson
f4557c1631
Remove myself from the docker module maintainers
...
Apologies, but I no longer use this module day-to-day myself, and I don't have the bandwidth right now to effectively triage changes in any kind of timely fashion.
2016-03-24 10:03:47 -04:00
Brian Coca
dabf28edbe
Merge pull request #2853 from Igelko/patch-1
...
docker: If cmd and entrypoint not set, don't match them
2016-03-24 06:29:49 -07:00
Victor Beresnev
6a279fd421
If cmd and entrypoint not set, don't match them
...
Hello!
I wanted stop the containers matched only by image name, but can't do this, if I not set cmd in playbook.
This behavior confused me.
If cmd or entrypoint is defined for running container, but not defined in playbook, makes matching behavior as this sample:
https://github.com/ansible/ansible-modules-core/blob/devel/cloud/docker/docker.py#L463
2016-03-24 11:53:49 +04:00
Brian Coca
0abade73c4
Merge pull request #2929 from gesellix/add_env_file_support_v2
...
add `env_file` support
2016-03-21 11:19:57 -07:00
Michael Scherer
e78e13b222
Improve/fix type checking for docker module
...
tls_* point to files, so should be type=path
count is a int, so tag it as such and avoid converting later
password should be tagged as no_log
2016-03-21 00:44:52 +01:00
Yannig Perré
b958985816
Add an example of extra_hosts option.
2016-03-20 14:33:32 +01:00
Schlueter
0028f58ab6
Add missing quote in docker documentation
2016-03-08 21:32:38 -05:00
Andrey Gubarev
45b3066c81
update docker_image's path param type to 'path'. Fixes #3175
2016-03-03 02:27:39 +03:00
Brian Coca
5129ef5590
Merge pull request #2993 from berlic/devel
...
Fix docker container restart
2016-03-01 00:01:12 -05:00
Brian Coca
76669fa16c
Merge pull request #2992 from dusdanig/devel
...
Adds ulimit to the docker module
2016-03-01 00:00:57 -05:00
Daniel Petty
bf04a0fe0e
replaced sudo with become
2016-02-18 08:00:27 -07:00
Daan Oosterveld
90153a2ca5
Adds ulimit to the docker module
...
The ulimit will be specified as a list and separated by colons. The
hard limit is optional, in which case it is equal to the soft limit.
The ulimits are compared to the ulimits of the container and added
or adjusted accordingly on by a reload.
The module ensures that ulimits are available in the capabilities
iff ulimits is passes as a parameter.
2016-02-10 10:31:54 +01:00
Konstantin Suvorov
d9f13a0bbc
Fix docker container restart
...
restart_containers(containers.running) may try to restart containers
that are deleted when looping through get_differing_containers()
fix this by refreshing list after first loop
2016-02-09 15:34:30 +03:00
Tobias Gesellchen
60e37e6fda
add env_file support (original code from @vpetersson)
2016-02-05 14:59:24 +01:00
Alexey Wasilyev
511ce25ac8
docker: fix failing in case of empty image tag
2016-01-21 11:53:39 +03:00
Brian Coca
9c80b1adb7
added note about awslogs version added
2016-01-18 09:16:38 -05:00
jefferson fermo
028ecad9d4
add awslog option in docker log driver. this option is available starting with ansible 2.1
2016-01-16 23:22:20 +08:00
Brian Coca
9d4403f2b3
Merge pull request #2521 from wrouesnel/docker_reloaded_fixes
...
docker: Fix state=reloaded to detect default LoggingDriver for docker
2016-01-12 10:47:30 -05:00
Brian Coca
061da7dc05
updated version_added
2016-01-12 08:27:33 -05:00
Alexey Wasilyev
d61772807c
Add cpu_shares option for docker module
2016-01-12 09:59:36 +03:00
Brian Coca
4be34067de
added versions note in description for new choice
2016-01-11 18:14:37 -05:00
Brian Coca
c1df014e3b
Merge pull request #2485 from sebi-hgdata/sebi/docker_unless_stopped
...
added unless stopped option to docker module
2016-01-11 18:09:24 -05:00
Brian Coca
f1754fb51e
Merge pull request #2376 from mtpereira/fix_2351
...
Add support for legacy registries to pull_image().
2016-01-11 18:03:51 -05:00
Pavel Derendyaev
61fdb52039
Add "timeout" option to Docker module
2016-01-09 21:59:23 +03:00
sebi
aa15231cb7
added unless stopped option
2015-12-21 11:55:06 +02:00
Toshio Kuratomi
15c1c0cca7
entrypoint feature added in 2.1
2015-12-18 21:28:01 -08:00
Toshio Kuratomi
2220dc8e12
Merge pull request #2185 from AndrewPashkin/add_entrypoint_param_to_docker_module
...
Add entrypoint parameter to docker module
2015-12-18 21:25:14 -08:00
Toshio Kuratomi
ba3ee25172
labels is actually not aded in 1.9.4 but in 2.1
2015-12-18 17:57:17 -08:00
Omar Khan
19ebc45364
Add stop_timeout option to docker module
2015-12-18 17:51:31 -08:00
Toshio Kuratomi
d907f889a3
Merge pull request #1972 from yannh/docker-restarted
...
Docker module: restarted should update the container when necessary
2015-12-18 17:42:35 -08:00
