Mirrors/geerlingguy.ansible-role-docker
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-docker.git synced 2025-08-02 13:46:22 +02:00
Code Issues Projects Releases Wiki Activity

fix: check bash-completion is installed

Browse Source
This commit is contained in:
Sergey Gripinskiy 2021-09-11 20:43:02 +03:00
parent f6335e4cbe
commit e6b99f038b
No known key found for this signature in database
GPG Key ID: 1E78FEB6C4E420D7
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -14,8 +14,8 @@ docker_install_compose: true
docker_compose_version: "1.29.2" docker_compose_version: "1.29.2"
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
docker_compose_path: /usr/local/bin/docker-compose docker_compose_path: /usr/local/bin/docker-compose
docker_compose_completion_url: https://raw.githubusercontent.com/docker/compose/{{ docker_compose_version }}/contrib/completion/bash/docker-compose docker_compose_bash_completion_url: https://raw.githubusercontent.com/docker/compose/{{ docker_compose_version }}/contrib/completion/bash/docker-compose
docker_compose_completion_path: /etc/bash_completion.d/docker-compose docker_compose_bash_completion_path: /etc/bash_completion.d/docker-compose
# Docker repo URL. # Docker repo URL.
docker_repo_url: https://download.docker.com/linux docker_repo_url: https://download.docker.com/linux

17
tasks/docker-compose.yml
View File

@ -11,7 +11,7 @@
state: absent state: absent
loop: loop:
- "{{ docker_compose_path }}" - "{{ docker_compose_path }}"
- "{{ docker_compose_completion_path }}" - "{{ docker_compose_bash_completion_path }}"
when: > when: >
docker_compose_current_version.stdout is defined docker_compose_current_version.stdout is defined
and docker_compose_version not in docker_compose_current_version.stdout and docker_compose_version not in docker_compose_current_version.stdout
@ -25,11 +25,16 @@
docker_compose_current_version.stdout is not defined docker_compose_current_version.stdout is not defined
or docker_compose_version not in docker_compose_current_version.stdout or docker_compose_version not in docker_compose_current_version.stdout
- name: Install Docker Compose command-line completion (if configured) - name: Gather installed packages in search for bash-completion.
package_facts:
manager: auto
- name: Install Docker Compose command-line completion for bash (if supported).
get_url: get_url:
url: "{{ docker_compose_completion_url }}" url: "{{ docker_compose_bash_completion_url }}"
dest: "{{ docker_compose_completion_path }}" dest: "{{ docker_compose_bash_completion_path }}"
mode: 0644 mode: 0644
when: > when: >
docker_compose_current_version.stdout is not defined 'bash-completion' in ansible_facts.packages and
or docker_compose_version not in docker_compose_current_version.stdout ( docker_compose_current_version.stdout is not defined
or docker_compose_version not in docker_compose_current_version.stdout )