merge: 'feature/arch-linux'

This commit is contained in:
Sascha Andres 2019-01-14 16:38:28 +01:00
commit 1d04f3c856
3 changed files with 10 additions and 0 deletions

View File

@ -2,6 +2,7 @@
# Edition can be one of: 'ce' (Community Edition) or 'ee' (Enterprise Edition).
docker_edition: 'ce'
docker_package: "docker-{{ docker_edition }}"
docker_package_archlinux: "docker" # we use the default installation like described in https://wiki.archlinux.org/index.php/docker#Installation
docker_package_state: present
# Service options.

View File

@ -10,6 +10,14 @@
name: "{{ docker_package }}"
state: "{{ docker_package_state }}"
notify: restart docker
when: ansible_os_family == 'RedHat' or ansible_os_family == 'Debian'
- name: Install Docker.
pacman:
name: "{{ docker_package_archlinux }}"
state: "{{ docker_package_state }}"
notify: restart docker
when: ansible_os_family == 'Archlinux'
# TODO: Remove this shim once 18.09.1 or later is released.
- import_tasks: docker-1809-shim.yml

View File

@ -0,0 +1 @@
---