cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6413 commits 47 branches 390 tags 440 MiB
Commit graph

153 commits

Author SHA1 Message Date
James Cammarata
a9b6d5a516 Merge branch 'docker-add-net-parameter' of https://github.com/discordianfish/ansible into discordianfish-docker-add-net-parameter 2014-08-08 13:09:19 -05:00
James Cammarata
18618b47b0 Merge branch 'fixes/docker-volumes' of https://github.com/devpopol/ansible into devpopol-fixes/docker-volumes 2014-08-08 12:24:21 -05:00
Kurt Yoder
2f74c0bade Fix Docker image name parsing 
Fixes #8357
 2014-07-30 14:33:01 -04:00
Joe Moretti
ca7498aeb7 Add optional docker_api_version parameter to Docker Module 2014-07-08 10:06:31 -05:00
Peter Kolloch
0f67a94820 Hack to fix #7738: Allow tag in image parameter of docker module 
It also defaults to the "latest" tag for pulling the image
instead of pulling all versions.
 2014-06-12 11:48:57 +02:00
Paul Myjavec
267d107fe6 Docker links and required alias 
If no alias is passed one will now be created for you with the same name
as the target link container, as per the documentation
 2014-06-10 22:53:55 +10:00
Johannes 'fish' Ziemke
b16cad7cd9 Add networking mode parameter (net) to docker 
Since 0.11 Docker supports different networking modes (see docker run
--net). This commit add support for that to the ansible docker module.

This depends on
2d58351164
 2014-05-29 18:59:03 +02:00
Stephen Paul Suarez
834168f17b fix spacing 2014-05-28 06:14:54 +08:00
Stephen Paul Suarez
bb0a56ad1d fix typo 2014-05-27 19:19:49 +08:00
Stephen Paul Suarez
6b84f7093f support rw bind mode in docker module 2014-05-27 16:18:23 +08:00
Matt Bray
901feb91fc docker: fix targetting images by name 2014-05-15 15:04:30 +01:00
James Cammarata
8622a3f396 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
f9e6db7886 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
b59e4e8222 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
ac14a016c4 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
b5ba1c4527 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
dccf70ec0b 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
4e7542315c 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
98d949e143 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
f068a4f26a 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
ae8b942e4a 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
45d2cab30c Small bug - 'acts' should be 'facts' 2014-04-21 08:06:00 -07:00
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.
 2014-04-17 16:10:53 -07:00
Joshua Conner
bac2e879b2 docker: send 1.10 params if docker-py is new enough version 2014-04-17 16:05:50 -07:00
Matt Bray
afd0e78f16 docker.client.APIError has moved to docker.errors.APIError 
see 18d4db09ec
 2014-04-16 23:42:56 +01:00
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.
 2014-04-14 15:05:42 -07:00
Matt Bray
3d20c585a6 docker: from API 1.10 dns and volumes_from should be passed to start() 2014-04-11 17:08:55 +01:00
Michael DeHaan
289b359139 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
2d9130fc23 docker: use type instead of manually casting strings to lists 2014-03-28 11:19:48 -04:00
Joshua Conner
15eaa859b0 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
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.
 2014-03-18 11:57:01 +00:00
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
 2014-03-14 14:28:46 +01:00
Joshua Conner
ad605390cd docker: add 'version_added' to the appropriate documentation entries 2014-02-25 17:04:01 -08:00
Joshua Conner
758b9603f5 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
a72733ebea Added modules description and examples 2014-02-12 17:06:58 -05:00
Pavel Antonov
ae99e8860e Docker supports links and port binding. Added docker_image module 2014-02-12 17:06:58 -05:00
Timur Batyrshin
9ad52632c5 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
cb6f7748d5 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
edc877d6b0 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
2c09d829cb add supported docker version to docs 2013-12-02 13:08:47 -08:00
James Tanner
4f9aadcc07 Addresses #5023 Fix import comments 2013-12-02 15:13:49 -05:00
James Tanner
38edad70ac Fixes #5023 Convert all modules to use new snippet import pattern 2013-12-02 15:11:23 -05:00
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.
 2013-11-18 18:55:49 -05:00
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.
 2013-11-16 23:15:03 +02:00
Cove Schneider
b69fdc270b Fixes from docker-ansible, update license to be same as other modules 2013-11-03 12:48:03 -08:00
Cove Schneider
729297bce8 update with current fixes from docker-ansible 2013-10-23 22:56:02 -07:00
Cove Schneider
502fe3cf5f Un-camelcase DockerContainers, rename class to DockerManager(). 2013-10-14 13:49:53 -07:00
Cove Schneider
21e31722f9 remove comment about requirements 2013-10-13 21:37:42 -07:00
Cove Schneider
b4cce885e3 add requirements back 2013-10-13 21:36:42 -07:00
Cove Schneider
8f0b3cac51 clean up a few warnings 2013-10-13 21:34:58 -07:00
Cove Schneider
0fc525ff11 add python requirements to docs 2013-10-13 21:14:27 -07:00
Cove Schneider
3859da2a76 add example docs 2013-10-13 20:34:14 -07:00
Cove Schneider
ea3745d7dd add docker module 2013-10-13 15:07:27 -07:00