Mirrors/geerlingguy.ansible-role-docker
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-docker.git synced 2025-09-26 17:51:03 +02:00
Code Issues Projects Releases Wiki Activity

[FIX] Merge conflicts

Browse Source
This commit is contained in:
Carrol Cox 2019-10-14 16:36:50 +05:00
commit 1ada072371
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -11,7 +11,7 @@ docker_restart_handler_state: restarted
# Docker Compose options. # Docker Compose options.
docker_compose_install: yes docker_compose_install: yes
docker_compose_version: '1.24.0' docker_compose_version: '1.24.1'
docker_compose_path: '/usr/local/bin/docker-compose' docker_compose_path: '/usr/local/bin/docker-compose'
docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64" docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64"
@ -21,6 +21,7 @@ lazydocker_version: '0.4'
lazydocker_path: '/usr/local/bin/lazydocker' lazydocker_path: '/usr/local/bin/lazydocker'
lazydocker_url: "https://github.com/jesseduffield/lazydocker/releases/download/v{{ lazydocker_version }}/lazydocker_{{ lazydocker_version }}_Linux_x86_64.tar.gz" lazydocker_url: "https://github.com/jesseduffield/lazydocker/releases/download/v{{ lazydocker_version }}/lazydocker_{{ lazydocker_version }}_Linux_x86_64.tar.gz"
# Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed. # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed.
docker_apt_release_channel: stable docker_apt_release_channel: stable
docker_apt_arch: amd64 docker_apt_arch: amd64

6
tasks/main.yml
View File

@ -43,12 +43,12 @@
- include_tasks: docker-compose-install.yml - include_tasks: docker-compose-install.yml
when: when:
- docker_compose_install - docker_compose_install | bool
- include_tasks: lazydocker-install.yml - include_tasks: lazydocker-install.yml
when: when:
- lazydocker_install - lazydocker_install | bool
- include_tasks: docker-users.yml - include_tasks: docker-users.yml
when: when:
- docker_users - docker_users | length > 0