cleanup: factor out docker-compose version (->group all)

master
Sven Ketelsen 4 years ago
parent be0511e29a
commit 49cf9e1612

@ -111,10 +111,8 @@
roles:
- role: ansible-role-docker
vars:
docker_compose_version: '1.29.1'
docker_compose_path: '/usr/bin/docker-compose'
docker_users: '{{ smardigo_plattform_users }}'
when:
- docker_enabled
- role: common

@ -71,6 +71,10 @@ smardigo_plattform_users:
docker_owner: "{{ admin_user }}"
docker_group: "{{ admin_user }}"
docker_users: "{{ smardigo_plattform_users }}"
docker_compose_version: "1.29.2"
docker_compose_path: "/usr/bin/docker-compose"
service_base_path: '/etc/smardigo'
# TODO we need a company email addresses

@ -122,7 +122,7 @@
- name: "Download docker bash completion"
get_url:
url: https://raw.githubusercontent.com/docker/cli/v20.10.6/contrib/completion/bash/docker
dest: /usr/share/bash-completion/docker
dest: /etc/bash_completion.d/docker
mode: '644'
when: docker_enabled
tags:
@ -130,8 +130,8 @@
- name: "Download docker-compose bash completion"
get_url:
url: https://raw.githubusercontent.com/docker/compose/1.29.1/contrib/completion/bash/docker-compose
dest: /usr/share/bash-completion/docker-compose
url: "https://raw.githubusercontent.com/docker/compose/{{ docker_compose_version }}/contrib/completion/bash/docker-compose"
dest: "/etc/bash_completion.d/docker-compose"
mode: '644'
when: docker_enabled
tags:

@ -51,10 +51,6 @@
roles:
- role: ansible-role-docker
vars:
docker_compose_version: '1.29.1'
docker_compose_path: '/usr/bin/docker-compose'
docker_users: '{{ smardigo_plattform_users }}'
when:
- docker_enabled

Loading…
Cancel
Save