Mirrors/geerlingguy.ansible-role-docker
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-docker.git synced 2024-11-18 19:10:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Felix Herzog 2019-10-28 14:43:54 +01:00
commit 6e18f1ba3f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -11,7 +11,7 @@ docker_restart_handler_state: restarted
# Docker Compose options. # Docker Compose options.
docker_install_compose: true docker_install_compose: true
docker_compose_version: "1.22.0" docker_compose_version: "1.24.1"
docker_compose_path: /usr/local/bin/docker-compose docker_compose_path: /usr/local/bin/docker-compose
# Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed. # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed.

4
tasks/main.yml
View File

@ -25,7 +25,7 @@
meta: flush_handlers meta: flush_handlers
- include_tasks: docker-compose.yml - include_tasks: docker-compose.yml
when: docker_install_compose when: docker_install_compose | bool
- include_tasks: docker-users.yml - include_tasks: docker-users.yml
when: docker_users when: docker_users | length > 0