Install docker from distro properly
The install-docker role was installing the wrong package name for distro package based installations. docker-engine is ancient on debuntu and appears to be called docker.io on both debian and ubuntu supported releases now. Go ahead and install docker.io on the Debian family of distros and docker on everything else (fedora, centos, suse, etc). Change-Id: I0d7a9b8257bd6db86bc6e3d8bb3d6c3c021d7954
This commit is contained in:
parent
055b96d5d7
commit
b570566334
@ -1,5 +1,5 @@
|
||||
- name: Install docker
|
||||
become: yes
|
||||
package:
|
||||
name: docker-engine
|
||||
name: docker.io
|
||||
state: present
|
5
roles/install-docker/tasks/distros/default.yaml
Normal file
5
roles/install-docker/tasks/distros/default.yaml
Normal file
@ -0,0 +1,5 @@
|
||||
- name: Install docker
|
||||
become: yes
|
||||
package:
|
||||
name: docker
|
||||
state: present
|
@ -14,8 +14,17 @@
|
||||
include: upstream.yaml
|
||||
when: use_upstream_docker
|
||||
|
||||
- name: Install docker-engine from distro
|
||||
include: distro.yaml
|
||||
- name: Install docker from distro
|
||||
include_tasks: "{{ lookup('first_found', params) }}"
|
||||
vars:
|
||||
params:
|
||||
files:
|
||||
- "{{ ansible_distribution }}.{{ ansible_architecture }}.yaml"
|
||||
- "{{ ansible_distribution }}.yaml"
|
||||
- "{{ ansible_os_family }}.yaml"
|
||||
- "default.yaml"
|
||||
paths:
|
||||
- distros
|
||||
when: not use_upstream_docker
|
||||
|
||||
- name: Add user to docker group
|
||||
|
Loading…
Reference in New Issue
Block a user