Commit graph

73 commits

Author SHA1 Message Date
Olaf Kilian
3d3efa3614 Removed unused import of sys module 2015-05-07 09:15:04 +02:00
Olaf Kilian
f5e7ce00e7 Extract only the hostname part from self.registry
This is needed for update_dockercfg() to register only the host part
of a specified registry URL in the .dockercfg.
2015-05-06 22:43:28 +02:00
Olaf Kilian
7a2a75f6c0 Remove registry from exit_json because misleading
docker-py is not returning the name of the registry
if already logged in. It can differ from the registry
specified by the user, which was return as registry.
2015-05-06 22:33:31 +02:00
Olaf Kilian
feb20eeadd Update PR based on review from @resmo 2015-05-06 22:28:36 +02:00
Olaf Kilian
772e92eca9 Add docker_login module
- Ansible version of "docker login" CLI command
- Persists Docker registry authentification in .dockercfg (only login once - no need to specify credentials over and over again anymore)
- Works for all other docker-py based modules (docker, docker_images) as well as the Docker CLI client
2015-05-03 17:13:34 +02:00
Michael DeHaan
73123b69fa Move modules into subdirectory. 2014-09-26 09:23:50 -04:00
James Cammarata
2fac1fd865 Ensure port in docker expose list is a string
Fixes #8731
2014-09-16 21:38:49 -05:00
Toshio Kuratomi
3f4bdce67e My fix was wrong again. Base this try off of @mantiz's fix in #9016 2014-09-16 11:46:09 -07:00
Toshio Kuratomi
e51bcf90a0 Fix the case where a docker image is not part of a namespace.
Fixes #9016
2014-09-16 11:39:15 -07:00
Toshio Kuratomi
4094edf92f Fix splitting the tag from the image name
Fixes #8983
2014-09-15 09:01:07 -07:00
Toshio Kuratomi
732b6f0a23 Omit tag from parsed image name
Fixes #8925
2014-09-11 11:27:00 -07:00
James Cammarata
fa21b336f8 Stop/remove existing docker container if the specified tag is different
Fixes #8278
2014-08-26 13:36:42 -05:00
Eric D. White
6f9cb7ab61 Issue 8735 - module docker - expose values should be striped to ensure port forwarding works. 2014-08-24 21:07:26 +01:00
James Cammarata
3373e82d83 Fixing bug with image/tag pulling in docker module
Fixes #8670
2014-08-22 14:08:40 -05:00
James Cammarata
d6375cd3c1 Fix bad commit from #8095 and fix bad splitting on :'s in the image
Fixes #8095
Fixes #8658
2014-08-18 10:37:07 -05:00
James Cammarata
f729ab8e67 Make env param a dict type instead of list
Also modifies param type checking code to remove whitespace from
around params before splitting them into k=v pairs.

Fixes #8199
2014-08-15 11:04:27 -05:00
James Cammarata
f367adc021 Update version_added field for docker_api_version param 2014-08-08 15:03:34 -05:00
James Cammarata
30ead6a17c Merge branch 'add-docker-api-version-parameter' of https://github.com/jmoretti/ansible into jmoretti-add-docker-api-version-parameter 2014-08-08 14:52:25 -05:00
James Cammarata
74847bfbfa Merge branch 'devel' of https://github.com/kolloch/ansible into kolloch-devel 2014-08-08 13:44:48 -05:00
James Cammarata
aa0a904b2b Updating version_added for docker net param and adding an example 2014-08-08 13:16:08 -05:00
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