Commit graph

43 commits

Author SHA1 Message Date
Matt Bray
8363ab5a6f docker: fix targetting images by name 2014-05-15 15:04:30 +01:00
James Cammarata
154ef942eb Merge pull request #7404 from jimi-c/issue_7363_docker_names
Make sure the docker data has a "Names" field before using it
2014-05-14 14:44:16 -05:00
Konstantin Shabanov
ad9225895b Fix env splitting in docker module
ENV variable value could contain '=' (for example mysql://host/db?pool=10)
2014-05-14 18:11:43 +04:00
James Cammarata
bfc1201ecd Make sure the docker data has a "Names" field before using it
Fixes #7363
2014-05-12 12:27:07 -05:00
Johannes 'fish' Ziemke
ea71c0c317 Fix: Remove check for Ghost state
This fixed the just committed change handling non existent Ghost state.
2014-05-09 20:13:25 +02:00
James Cammarata
c97dec9d75 Merge pull request #7338 from discordianfish/remove-ghost-state
Remove check for Ghost state
2014-05-09 13:06:16 -05:00
Johannes 'fish' Ziemke
b9d9ef511f Remove check for Ghost state
This doesn't exist anymore and causes ansible to throw a KeyError
2014-05-09 18:07:02 +02:00
James Cammarata
5c7109b8b9 Merge pull request #7110 from orgoj/docker-patch-version_comment
module docker - add docker version comment
2014-05-09 00:57:41 -05:00
James Cammarata
16874464e9 Merge pull request #7047 from joshuaconner/docker_bugfix_exclude_entrypoint_from_command_check
docker: exclude 'entrypoint' from comparing 'command' param with containers
2014-04-23 16:14:48 -05:00
James Cammarata
060e2193a1 Merge pull request #6991 from joshuaconner/bugfix_dont_send_wrong_params_to_dockerclient_start
Docker: don't send wrong parameters to client.start()
2014-04-23 15:48:04 -05:00
Michael Heca
9ad6511be7 module docker - add docker version comment
Default docker version 0.9.1 from Ubuntu 14.04 LTS don't report APIVersion.
2014-04-22 12:21:51 +02:00
CaptTofu
2990db728a Small bug - 'acts' should be 'facts' 2014-04-21 08:06:00 -07:00
Joshua Conner
4defd9a15a 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.
2014-04-17 16:10:53 -07:00
Joshua Conner
10171dc42b docker: send 1.10 params if docker-py is new enough version 2014-04-17 16:05:50 -07:00
Matt Bray
3948dc2d1d docker.client.APIError has moved to docker.errors.APIError
see 18d4db09ec
2014-04-16 23:42:56 +01:00
Joshua Conner
0ef288dcc8 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.
2014-04-14 15:05:42 -07:00
Matt Bray
71b5a11735 docker: from API 1.10 dns and volumes_from should be passed to start() 2014-04-11 17:08:55 +01:00
Michael DeHaan
7db784687d Merge pull request #6486 from discordianfish/docker-module-add-running
Rename present to running, add new present state
2014-03-28 11:50:21 -04:00
Joshua Conner
7a6c60b437 docker: use type instead of manually casting strings to lists 2014-03-28 11:19:48 -04:00
Joshua Conner
7bba229838 docker bugfixes: trim whitespace around list param elements, handle list params being coerced to int or long type 2014-03-28 11:19:13 -04:00
Matt Bray
79b3efc989 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.
2014-03-18 11:57:01 +00:00
Johannes 'fish' Ziemke
32fa21c95f 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
2014-03-14 14:28:46 +01:00
Joshua Conner
9c72b52c01 docker: add 'version_added' to the appropriate documentation entries 2014-02-25 17:04:01 -08:00
Joshua Conner
66eb91c2f8 docker: update to docker-py 0.3.0, plus full port binding support, container names, links 2014-02-25 15:24:46 -08:00
Pavel Antonov
dddd4b2522 Added modules description and examples 2014-02-12 17:06:58 -05:00
Pavel Antonov
df41ed90b8 Docker supports links and port binding. Added docker_image module 2014-02-12 17:06:58 -05:00
Timur Batyrshin
658c15930e reword "except Error as e:" into "except Error, e:" to be compatible with Python 2.5 (#5852) 2014-02-03 13:00:40 -06:00
Michael DeHaan
6f49642286 All modules should be using /usr/bin/python in the shebang as ansible_python_interpreter processes this (see FAQ).
Fixing for standardization purposes.
2014-01-15 09:52:17 -05:00
Michael DeHaan
27199dc219 Merge pull request #5133 from joshuaconner/add_docker_max_version_to_docs
add supported docker version to docs
2013-12-03 16:46:34 -08:00
Joshua Conner
c2f128f737 add supported docker version to docs 2013-12-02 13:08:47 -08:00
James Tanner
ad837709bd Addresses #5023 Fix import comments 2013-12-02 15:13:49 -05:00
James Tanner
6000d636b3 Fixes #5023 Convert all modules to use new snippet import pattern 2013-12-02 15:11:23 -05:00
Michael DeHaan
f7c3975f21 Add version_added to all modules missing version_added information, the docs formatter will now
raise errors when omitted, updated changelog with new modules.
2013-11-18 18:55:49 -05:00
Tom Berger
8a39e0a615 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.
2013-11-16 23:15:03 +02:00
Cove Schneider
1ea17dee11 Fixes from docker-ansible, update license to be same as other modules 2013-11-03 12:48:03 -08:00
Cove Schneider
94574f7296 update with current fixes from docker-ansible 2013-10-23 22:56:02 -07:00
Cove Schneider
5f7e1fc306 Un-camelcase DockerContainers, rename class to DockerManager(). 2013-10-14 13:49:53 -07:00
Cove Schneider
565db64a04 remove comment about requirements 2013-10-13 21:37:42 -07:00
Cove Schneider
a4922bc74c add requirements back 2013-10-13 21:36:42 -07:00
Cove Schneider
618004f87b clean up a few warnings 2013-10-13 21:34:58 -07:00
Cove Schneider
c51981b5b7 add python requirements to docs 2013-10-13 21:14:27 -07:00
Cove Schneider
fbca1ebc04 add example docs 2013-10-13 20:34:14 -07:00
Cove Schneider
1fe45c4f6c add docker module 2013-10-13 15:07:27 -07:00