Commit Graph

34 Commits (b759dd194c209486b7c5b084643055ef60a96d05)

Author SHA1 Message Date
James Cammarata 98d949e143 Merge pull request #7047 from joshuaconner/docker_bugfix_exclude_entrypoint_from_command_check
docker: exclude 'entrypoint' from comparing 'command' param with containers
11 years ago
James Cammarata f068a4f26a Merge pull request #6991 from joshuaconner/bugfix_dont_send_wrong_params_to_dockerclient_start
Docker: don't send wrong parameters to client.start()
11 years ago
CaptTofu 45d2cab30c Small bug - 'acts' should be 'facts' 11 years ago
Joshua Conner 0ce43d6e3c docker: exclude 'entrypoint' from comparing 'command' param with containers
The JSON the Docker API returns includes the container's ENTRYPOINT value (if it has one) with the 'Command' value. So instead of checking if `container['Command'] == module.params['command']`, we just check that `container['Command'].endswith(module.params['command'])` so the entrypoint won't affect a container being properly classified as matching the module params or not.

Also I refactored a super-long `if` statement into some temporary variables - I did it to help me figure out what was going wrong, and then it makes the code more readable so I kept it.
11 years ago
Joshua Conner bac2e879b2 docker: send 1.10 params if docker-py is new enough version 11 years ago
Matt Bray afd0e78f16 docker.client.APIError has moved to docker.errors.APIError
see 18d4db09ec
11 years ago
Joshua Conner 6bf75de95c Docker: don't send wrong parameters to client.start()
As part of being updated for the 1.10 API, a couple of parameters were passed to the docker.client.start() command that it doesn't accept. This caused the module to error out if it tried to start any Docker containers. This removes those parameters so the module works again.
11 years ago
Matt Bray 3d20c585a6 docker: from API 1.10 dns and volumes_from should be passed to start() 11 years ago
Michael DeHaan 289b359139 Merge pull request #6486 from discordianfish/docker-module-add-running
Rename present to running, add new present state
11 years ago
Joshua Conner 2d9130fc23 docker: use type instead of manually casting strings to lists 11 years ago
Joshua Conner 15eaa859b0 docker bugfixes: trim whitespace around list param elements, handle list params being coerced to int or long type 11 years ago
Matt Bray a351f40fff docker: add tty and stdin_open options
Useful for development environments.  Setting these options to true
allows you to `docker attach` to a docker container started with
ansible.
11 years ago
Johannes 'fish' Ziemke 459a76c0dd Rename present to running, add new present state
The new present state just makes sure that a container exists, not that
it's running, although it get started one creation.
This is very useful for data volumes. This also changes the old
present, now running (default) state to only create the container if
it's not found, otherwise it just get started.

See also discussion on mailinglist:
https://groups.google.com/forum/#!topic/ansible-devel/jB84gdhPzLQ

This closes #6395
11 years ago
Joshua Conner ad605390cd docker: add 'version_added' to the appropriate documentation entries 11 years ago
Joshua Conner 758b9603f5 docker: update to docker-py 0.3.0, plus full port binding support, container names, links 11 years ago
Pavel Antonov a72733ebea Added modules description and examples 11 years ago
Pavel Antonov ae99e8860e Docker supports links and port binding. Added docker_image module 11 years ago
Timur Batyrshin 9ad52632c5 reword "except Error as e:" into "except Error, e:" to be compatible with Python 2.5 (#5852) 11 years ago
Michael DeHaan cb6f7748d5 All modules should be using /usr/bin/python in the shebang as ansible_python_interpreter processes this (see FAQ).
Fixing for standardization purposes.
11 years ago
Michael DeHaan edc877d6b0 Merge pull request #5133 from joshuaconner/add_docker_max_version_to_docs
add supported docker version to docs
11 years ago
Joshua Conner 2c09d829cb add supported docker version to docs 11 years ago
James Tanner 4f9aadcc07 Addresses #5023 Fix import comments 11 years ago
James Tanner 38edad70ac Fixes #5023 Convert all modules to use new snippet import pattern 11 years ago
Michael DeHaan 08996d78d6 Add version_added to all modules missing version_added information, the docs formatter will now
raise errors when omitted, updated changelog with new modules.
11 years ago
Tom Berger 9344bc175d Update cloud/docker: if the image name containes a repository, strip it.
When using repositories other than the main one at docker.io, the image name contains the repo name (which itself contains ":" as a separator between domain and port). We don't really care about it here, so just get rid of it before looking at the image name.
11 years ago
Cove Schneider b69fdc270b Fixes from docker-ansible, update license to be same as other modules 11 years ago
Cove Schneider 729297bce8 update with current fixes from docker-ansible 11 years ago
Cove Schneider 502fe3cf5f Un-camelcase DockerContainers, rename class to DockerManager(). 11 years ago
Cove Schneider 21e31722f9 remove comment about requirements 11 years ago
Cove Schneider b4cce885e3 add requirements back 11 years ago
Cove Schneider 8f0b3cac51 clean up a few warnings 11 years ago
Cove Schneider 0fc525ff11 add python requirements to docs 11 years ago
Cove Schneider 3859da2a76 add example docs 11 years ago
Cove Schneider ea3745d7dd add docker module 11 years ago