Commit Graph

244 Commits (205b8b9524b3b4ca6e3d2f28002c49f391f343c7)

Author SHA1 Message Date
Toshio Kuratomi 15c1c0cca7 entrypoint feature added in 2.1 9 years ago
Toshio Kuratomi 2220dc8e12 Merge pull request #2185 from AndrewPashkin/add_entrypoint_param_to_docker_module
Add entrypoint parameter to docker module
9 years ago
Toshio Kuratomi ba3ee25172 labels is actually not aded in 1.9.4 but in 2.1 9 years ago
Omar Khan 19ebc45364 Add stop_timeout option to docker module 9 years ago
Toshio Kuratomi d907f889a3 Merge pull request #1972 from yannh/docker-restarted
Docker module: restarted should update the container when necessary
9 years ago
Toshio Kuratomi 581b4f6de6 Add version_added to documentation 9 years ago
Joe Quadrino 8fe5d6f7ef add devices parameter for docker module 9 years ago
Brian Coca 4e8d04d248 Merge pull request #2159 from leonty/devel
Support 'labels' parameter for docker.
9 years ago
Brian Coca a876704740 Merge pull request #2239 from boushley/devel
Fix issue with comparing versions improperly
9 years ago
Brian Coca ed43b66d77 made note that Z/z are only 2.1 options 9 years ago
Steve Spencer fc5da26dee Sync up with allowable docker volume mounting modes 9 years ago
Steve Spencer 2c95641d66 Add support for mounting host volumes with Z and z options 9 years ago
Toshio Kuratomi f2943bd404 Add zfil as an owner of the docker module 9 years ago
Toshio Kuratomi 4ed7b690f6 Add a new contributor as a maintainer of the docker module 9 years ago
Toshio Kuratomi 750aa16a06 Merge pull request #2093 from zfil/fix_facts
docker module: fix regressions introduced by f38186c and 80aca4b
9 years ago
Leonty cff83dd257 Merge remote-tracking branch 'upstream/devel' into devel 9 years ago
Leonty 5b904c1401 Corrected misspelling in the 'labels' docker parameter documentation. 9 years ago
Toshio Kuratomi e318be30ff Fix issues version_added and chaged => changed typo 9 years ago
Michael Schuett 80c2e28a48 Fix message
Previous fix did not actual work. This fix does however.
9 years ago
Michael Schuett b0357bf9e8 Handle connection error
Try and help when mac hits a connection error.
9 years ago
Michael Schuett 1dcb31cad6 remove .geturl()
Can't call geturl on a string.
9 years ago
Michael Schuett c126498899 Remove faulty logic
Update logic after splitting the error into two separate messages.
9 years ago
Michael Schuett 1e8d20b0da Documentation Fix
Updated documentation to match current module state.
9 years ago
Michael Schuett 0a5b7087bd 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.
9 years ago
Michael Schuett addbc329be 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.
9 years ago
Michael Schuett bf5929d32a 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.
9 years ago
Brian Coca 4c14e6267f Merge pull request #2258 from SamYaple/fix_docker_bug_2257
Don't assume ExposedPorts exists (bug #2257)
9 years ago
Adam Williamson 64b8596250 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.
9 years ago
Sam Yaple f15d285514 Catch the second occurance of ExposedPorts as well 9 years ago
Sam Yaple 9db5ac8e45 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
9 years ago
Brian Coca da1a317f7d Merge pull request #2139 from justnom/devel
Adding additional Docker log drivers.
9 years ago
Aaron Boushley 81e9d1bde5 Fix issue with comparing versions improperly.
This allows old versions of docker api to function.
9 years ago
Andrew Pashkin cee7e928fc Add 'entrypoint' parameter to Docker module 9 years ago
Colin Hutchinson f7aa6c4d27 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
9 years ago
Andrew Pashkin e96549c95d Harden matching running containers by "command" in the Docker module
Before this patch:

  - Command was matched if 'Command' field of docker-py
    representation of Docker container ends with 'command' passed
    to Ansible docker module by user.
  - That can give false positives and false negatives.
  - For example:
      a) If 'command' was set up with more than one spaces,
         like 'command=sleep  123', it would be never matched again
         with a container(s) launched by this task.
         Because after launching, command would be normalized and
         appear, in docker-py API call, just as 'sleep 123' - with one
         space. This is false negative case.
      b) If 'entrypoint + command = command', for example
         'sleep + 123 = sleep 123', module would give false positive
         match.

This patch fixes it, by making matching more explicit - against
'Config'->Cmd' field of 'docker inspect' output, provided by docker-py
API and with proper normalization of user input by splitting it to
tokens with 'shlex.split()'.
9 years ago
Leonty 2080c8ab6e Support 'labels' parameter for docker. 9 years ago
justnom 518ac36878 Adding additional Docker log drivers.
Adding additional `log_driver` choices:
* journald
* gelf
* fluentd

Compatible with Docker version >= 1.8.0
9 years ago
Philippe Jandot 8052d49b07 fix regression introduced by f38186ce8b, and propose a fix for docker facts 9 years ago
David Dyball a0a374b8ca Updated PR based on comments 9 years ago
Toshio Kuratomi 6e5a832dc2 Fix read-only usage to depend on the docker-py and docker server version 9 years ago
Toshio Kuratomi 1f358f349b 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. 9 years ago
Yann Hamon 8f03f1e4e1 Docker module: restarted should update the container when necessary 9 years ago
Omri Iluz daf7a0551b No need for .keys on volumes list
Since c3f92cca21 changed "volumes" to be a list instead of a dictionary, we don't need (and cannot) .keys when appending to set.
Reported as bug #1957
9 years ago
Ilya Epifanov d951172920 fixed memory_limit for docker api version >= 1.19 9 years ago
sebi 599d60efc0 mem_limit client version check 9 years ago
Toshio Kuratomi 1001eae3c8 Set a default value for DEFAULT_DOCKER_API_VERSION so we can create the AnsibleModule without docker-py 9 years ago
Brian Coca c6da9d0758 added missing version_Added to extra_hosts
fixes #1843
9 years ago
Toshio Kuratomi 2785364ebe Merge pull request #1736 from larsks/bug/docker-version-parse
docker: fix parsing of docker __version__ string
9 years ago
Brian Coca 49400d90ac Merge pull request #1830 from ecliptik/devel
Fix incorrect var name for api_version
9 years ago
Micheal Waltz b43f236b05 Fix incorrect var name for api_version 9 years ago