Commit Graph

153 Commits (6288d44581e1d6eb5505d52ac692a9ef8f6b4918)

Author SHA1 Message Date
Toshio Kuratomi 964d731722 Add version_added documentation to log_driver parameter 10 years ago
Toshio Kuratomi 718f32a042 Merge pull request #1405 from ryanwalls/docker-module-log-driver
Add support for --log-driver option that docker released with Docker 1.6
10 years ago
Brian Coca 19f6099777 minor doc fixes 10 years ago
Robin Roth 64fe01178f add comment: ports need to be exposed.
port mapping with this module only works for ports that are exposed either in the Dockerfile or via an additional arguments. This is different from the command line docker client, that is willing to also map ports that are not exposed.

This comments makes the behaviour more obvious.
10 years ago
Greg DeKoenigsberg 28a869a030 Updating cloud modules with proper github author information 10 years ago
Ryan Walls a2630d40fb Fix typo in Docker module. 10 years ago
Ryan Walls 88eddb13c0 Update docker module to avoid false positives when containers are first created. Also have the module check
for api compatibility before trying to set a "--log-driver" option.
10 years ago
Ryan Walls c95717afe5 Set default "log_driver" option to None in docker module. 10 years ago
Ryan Walls 5f1d88a829 Update docker module to look at log_driver variable when deciding if container configuration has changed. 10 years ago
Andrew Pashkin 27c174128b Add 'docker_api_version' to docker_image
By default docker-py uses latest version of Docker API. This is not
always desireable, and this patch adds option to specify version, that
should be used.
10 years ago
Ryan Walls 3f679933a6 Add support for --log-driver option that docker released with Docker 1.6 10 years ago
Pierre Baillet 06e3ac7bf4 Support optional dockerfile name 10 years ago
Toshio Kuratomi 60a66a544d Several cleanups to many modules:
* Fix docs to specify when python2.6+ is required (due to a library
  dep).  This helps us know when it is okay to use python2.6+ syntax in
  the file.
* remove BabyJson returns.  See #1211  This commit fixes all but the
  openstack modules.
* Use if __name__ == '__main__' to only run the main part of the module
  if the module is run as a program.  This allows for the potential to
  unittest the code later.
10 years ago
Ratnadeep Debnath be66acb436 Fixed typo in cloud docker module. 10 years ago
Toshio Kuratomi f444e49dfa Fix error when container has no names.
Rename loop variable from "i" to more informative "container"

Fixes #1188
10 years ago
Pascal Borreli f29a6ec54d Fixed typos 10 years ago
Toshio Kuratomi 1fdf75d49d Second try at fixing #1227 -- set e default value earlier 10 years ago
Toshio Kuratomi e51ea29d8f Return empty list if an image has no repo_tags 10 years ago
Toshio Kuratomi e356692c74 Get docker's default api version definition from both 1.2 location and pre-1.2 location
Fixes #1227
10 years ago
Brian Coca 09aa79c58f Merge pull request #1102 from heiparta/extra_hosts
Add support for extra_hosts to docker module
10 years ago
Brian Coca a811b9f12e removed deprecated docs, not true anymore 10 years ago
Toshio Kuratomi e95c0b2df3 Only split on the first colon.
Fixes #1214
10 years ago
Heikki Partanen 91ca2d6386 Add support for extra_hosts to docker module
extra_hosts parameter (maps to --add-host in 'docker run' syntax) is used
to add host-to-ip mappings to the container.
10 years ago
Ash Wilson 45b067f097 Record facts for each changed container. 10 years ago
Ryan Trauntvein 5320cc93e6 Specify that "state: reloaded" was added in Ansible 1.9 10 years ago
Ash Wilson 9ce2fc718a Only fetch details when necessary. 10 years ago
Ash Wilson 47f4c3f2e5 Compare container images to Config.Image. 10 years ago
moncho 3421712e05 Update docker.py
Fix typo that prevents use_tls 'encrypt' option from working properly.
10 years ago
Toshio Kuratomi 76198a8223 Merge pull request #961 from nemunaire/fix-docker-version-print
[docker] Fix formating error when remote host doesn't have required version
10 years ago
Toshio Kuratomi e338fef730 Add another valid status from downloading images 10 years ago
nemunaire fce8c21176 Convert tuple items to string before format 10 years ago
Toshio Kuratomi 8658b82de7 Some code cleanup (removed unused variables and imports) 10 years ago
Toshio Kuratomi 34c4e0d495 Also use DOCKER_TLS_VERIFY env var to turn on tls verification 10 years ago
Toshio Kuratomi ceda82603a Merge pull request #947 from ansible/docker-tls-none
When no use_tls is not specified and no tls parameters are given we need to not attempt tls.
10 years ago
Toshio Kuratomi b0d194ea94 Fix a potential bug in docker pull 10 years ago
Toshio Kuratomi 5b4d7a2182 When no use_tls is not specified and no tls parameters are given we need to not attempt tls. 10 years ago
Toshio Kuratomi 45637176dc Merge branch 'volumes_from' of https://github.com/lorin/ansible-modules-core into lorin-volumes_from
Remove volumes_from altogether

Conflicts:
	cloud/docker/docker.py
10 years ago
Toshio Kuratomi e4a5b46cfb Merge pull request #936 from ansible/docker-pid-mode
Make pid_mode parameter do minimum docker-py/docker server version checks
10 years ago
Toshio Kuratomi 81fc92bd66 Make state=running work for backwards compatibility with 1.8 10 years ago
Toshio Kuratomi bddd02bfcb Fix lookup of parameter name to be pid instead of pid_mode 10 years ago
Toshio Kuratomi 9d0d54b9a6 Merge pull request #926 from ansible/docker-tls-alt-854
Alternative implementation of tls for docker
10 years ago
Toshio Kuratomi cf9374f3ea Make pid_mode parameter do minimum docker-py/docker server version checks 10 years ago
Toshio Kuratomi 3a6cc86578 Fix for problems found by @dguerri
* TLSConfig['verify'] has to be set to False if we're only encrypting the
  connection, not verifying the host.
* tls_hostname was not set if tls_ca_cert was not present

https://github.com/ansible/ansible-modules-core/pull/926#issuecomment-78573877
10 years ago
Toshio Kuratomi 1add8ed9e5 Implement comments from @smashwilson:
* if tls_ca_cert is set then use tls to verify the server
* take tls_hostname from the environment variable DOCKER_TLS_HOSTNAME
  if it's not specified in the playbook

https://github.com/ansible/ansible-modules-core/pull/926#issuecomment-78542210
10 years ago
Ian Babrou 763f472f5b fixed: global name 'e' is not defined 10 years ago
Toshio Kuratomi 3e0cbc82f1 Alternative implementation of tls for docker
Alternative to #854
10 years ago
Toshio Kuratomi ca32205c7b Documentation style changes 10 years ago
Ian Babrou 9ecfde7551 not triggering reload for links and not string env variables 10 years ago
Ash Wilson 0969fd75c8 Use {0}, {1} style format indices for 2.6 compat 10 years ago
Ash Wilson 19664a96db Expect module env vars to override Dockerfile ones. 10 years ago