b4f87ac7fe
made note that Z/z are only 2.1 options
2016-12-08 11:23:52 -05:00
d4aca8eacc
Sync up with allowable docker volume mounting modes
2016-12-08 11:23:52 -05:00
769d7db1d0
Add support for mounting host volumes with Z and z options
2016-12-08 11:23:52 -05:00
22648e88cd
Corrected misspelling in the 'labels' docker parameter documentation.
2016-12-08 11:23:52 -05:00
876bdb62e1
Fix issue with comparing versions improperly.
...
This allows old versions of docker api to function.
2016-12-08 11:23:51 -05:00
8638d9d26c
Support 'labels' parameter for docker.
2016-12-08 11:23:51 -05:00
6f214bccca
Add zfil as an owner of the docker module
2016-12-08 11:23:47 -05:00
edaa4c3f32
Add a new contributor as a maintainer of the docker module
2016-12-08 11:23:47 -05:00
5b7d72e4ef
fix regression introduced by f38186ce8b49ea98e29241712da45917a3154e73, and propose a fix for docker facts
2016-12-08 11:23:46 -05:00
2619ec5321
Fix issues version_added and chaged => changed typo
2016-12-08 11:23:45 -05:00
e61a4f2fb5
Fix message
...
Previous fix did not actual work. This fix does however.
2016-12-08 11:23:45 -05:00
0cefc2358b
Handle connection error
...
Try and help when mac hits a connection error.
2016-12-08 11:23:45 -05:00
536bfb521a
remove .geturl()
...
Can't call geturl on a string.
2016-12-08 11:23:45 -05:00
6ff693f975
Remove faulty logic
...
Update logic after splitting the error into two separate messages.
2016-12-08 11:23:45 -05:00
5a20bb473b
Documentation Fix
...
Updated documentation to match current module state.
2016-12-08 11:23:44 -05:00
8d1f8dacba
Improve Message
...
Give user a course of action in the case where the suggestions do not
work. This will hopefully allow us to work through any further issues
much faster.
2016-12-08 11:23:44 -05:00
53294dbaaa
Improve Error Reporting
...
This will hopefully help mac users be able to quickly resolve any issues
they may find when trying to use this module.
2016-12-08 11:23:44 -05:00
75a61ae6e1
docker_image TLS
...
Check commit enables using tls when using the docker_image module. It
also removes the default for docker_url which doesn't allow us to check
for DOCKER_HOST which is a more sane default. This allows you to use
docker_image on OSX but more documentation is needed.
2016-12-08 11:23:44 -05:00
83d941da27
fix #2043 : strip empty dict from end of 'pull' stream
...
When pulling an image using Docker 1.8, it seems the output
JSON stream has an empty dict at the very end. This causes
ansible to fail when pulling an image, as it's expecting a
status message in that dict which it uses to determine whether
it had to download the image or not. As a bit of an ugly hack
for that which remains backward compatible, try the last item
in the stream, and if it's an empty dict, take the last-but-one
item instead.
The strip() is needed as the exact value appears to be '{}/r/n';
we could just match that, but it seems like the kind of thing
where maybe it'd happen to just be '{}/n' or '{}' or something
in some cases, so let's just use strip() in case.
2016-12-08 11:23:40 -05:00
a4a4b6f423
Catch the second occurance of ExposedPorts as well
2016-12-08 11:23:40 -05:00
463fb5a058
Don't assume ExposedPorts exists (bug #2257 )
...
A recent change [1] in docker between v1.8.2 and v1.8.3 changed what
is returned in the json when inspecting an image. Five variables which
could have been expected before will now be omited when empty. Only
one of those variables is being addressed in the docker, ExposedPorts.
Unfortunately there was also no API version change on this so this
can't be easily corrected with pinning the API to the older version.
This does a get() which will return None if the variable is not in the
dict formed from the json that was returned. Everything else works the
same way.
[1] 9098628b29
2016-12-08 11:23:40 -05:00
d70c33f932
make a text link into a actual hyperlink
...
the text link doesn't fit on some screen resolutions. Making it into sphinx hyperlink will solve that
2016-12-08 11:23:39 -05:00
b724bf8f1c
Adding additional Docker log drivers.
...
Adding additional `log_driver` choices:
* journald
* gelf
* fluentd
Compatible with Docker version >= 1.8.0
2016-12-08 11:23:38 -05:00
cdff62643b
Updated PR based on comments
2016-12-08 11:23:35 -05:00
b3262479e9
Fix read-only usage to depend on the docker-py and docker server version
2016-12-08 11:23:34 -05:00
13ab511642
We had two separate methods trying to do the same thing but neither one was complete. This merges them so that all of the options get parsed and applied.
2016-12-08 11:23:34 -05:00
1c6acc3e8f
No need for .keys on volumes list
...
Since c3f92cca21#1957
2016-12-08 11:23:33 -05:00
cbbf284a74
fixed memory_limit for docker api version >= 1.19
2016-12-08 11:23:32 -05:00
ce1afd01e0
mem_limit client version check
2016-12-08 11:23:30 -05:00
98e600961f
Set a default value for DEFAULT_DOCKER_API_VERSION so we can create the AnsibleModule without docker-py
2016-12-08 11:23:29 -05:00
9241955076
added missing version_Added to extra_hosts fixes #1843
2016-12-08 11:23:27 -05:00
5f0d989973
Fix incorrect var name for api_version
2016-12-08 11:23:27 -05:00
92dfe33021
defined DEFAULT_DOCKER_API_VERSION to avoid it erroring out before we send the message that docker.py is missing
2016-12-08 11:23:26 -05:00
950701ba3e
Use a if/else instead to avoid loading possibly invalid values for Memory
2016-12-08 11:23:25 -05:00
af5e402b87
Set the API version when checking differences in containers and use this to determine the location of the Memory value depending on the version used.
...
In v1.18 and earlier it was ['Config']['Memory'], but in v1.19 it
changed to ['HostConfig']['Memory'].
2016-12-08 11:23:25 -05:00
f36666ae1d
Use proper HostConfig element which contians the proper Memory value - fixes #1766
2016-12-08 11:23:25 -05:00
3d79d96a1b
restore mem_limit
...
mem_limit got lost in the #1744 ; this restores it. Thanks to @dgromov
for the report.
2016-12-08 11:23:25 -05:00
562341049e
docker: fix parsing of docker __version__ string
...
If `docker.__version__` contains non-digit characters, such as:
>>> import docker
>>> docker.__version__
'1.4.0-dev'
Then `get_docker_py_versioninfo` will fail with:
ValueError: invalid literal for int() with base 10: '0-de'
This patch corrects the parsing of the version string so that
`get_docker_py_versioninfo` in this example would return:
(1, 4, 0, '-dev')
2016-12-08 11:23:25 -05:00
6a9a4d905a
ensures API compatibility for read_only containers
2016-12-08 11:23:24 -05:00
c88feaff7e
changed version_added for read_only param
...
this feature will be released in 2.0
2016-12-08 11:23:24 -05:00
6231a9d52f
Added support for --read-only Docker containers
...
Adds support for mounting the container's root filesystem as read only.
2016-12-08 11:23:24 -05:00
426ec96ea5
docker: add support to add/drop capabilities
2016-12-08 11:23:23 -05:00
1976ed931a
minor doc fixes to docker_user
2016-12-08 11:23:23 -05:00
b62a6f01ab
added version_Added for new signal option in docker module
2016-12-08 11:23:23 -05:00
07fedaa03a
corrected v ersion added
2016-12-08 11:23:23 -05:00
277065a302
Too late for 1.8
2016-12-08 11:23:23 -05:00
3a68101fa3
Switch to _cap_ver_req and add cpu_set to create_containers
2016-12-08 11:23:23 -05:00
f37510ebaa
Add optional signal parameter when killing docker container
2016-12-08 11:23:23 -05:00
5b029bde98
Renamed to cpu_set
2016-12-08 11:23:22 -05:00
940baa92a6
Add support for cpusets. Requires docker-py >= 0.6.0
2016-12-08 11:23:22 -05:00
Brian Coca
Steve Spencer
Leonty
Aaron Boushley
Toshio Kuratomi
Philippe Jandot
Michael Schuett
Adam Williamson
Sam Yaple
Colin Hutchinson
justnom
David Dyball
Omri Iluz
Ilya Epifanov
sebi
Micheal Waltz
Lars Kellogg-Stedman
Johan Haals
Christian Hammerl
Daniel Kerwin
nemunaire