mirror of
https://github.com/geerlingguy/ansible-role-docker.git
synced 2025-08-15 13:48:28 +02:00
Fix: extend my change to support installs >=18.01
This commit is contained in:
parent
6e555e6b03
commit
a81f0afd18
25
tasks/docker-redhat.yml
Normal file
25
tasks/docker-redhat.yml
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
---
|
||||||
|
- name: Set Docker package name
|
||||||
|
set_fact:
|
||||||
|
docker_install_name: "{{ docker_package }}{{ '-' if docker_package_version }}{{ docker_package_version|default(omit) }}"
|
||||||
|
|
||||||
|
- name: Check all the facts
|
||||||
|
debug:
|
||||||
|
msg: "Package: {{ docker_install_name }}, Is bigger then 18.01: {{ docker_package_version is version('18.01', '>=') }}"
|
||||||
|
|
||||||
|
- name: Install Docker 17.03 on CentOS/Redhat
|
||||||
|
when: docker_package_version is version('17.03', '>=') and docker_package_version is version('18.01', '<')
|
||||||
|
yum:
|
||||||
|
name:
|
||||||
|
- "docker-ce-selinux-{{ docker_package_version }}"
|
||||||
|
- "{{ docker_install_name }}"
|
||||||
|
conf_file: "{{ docker_yum_config }}"
|
||||||
|
state: "{{ docker_package_state }}"
|
||||||
|
notify: restart docker
|
||||||
|
|
||||||
|
- name: Install Docker on CentOS/Redhat
|
||||||
|
when: docker_package_version is none or docker_package_version is version('18.01', '>=')
|
||||||
|
package:
|
||||||
|
name: "{{ docker_install_name }}"
|
||||||
|
state: "{{ docker_package_state }}"
|
||||||
|
notify: restart docker
|
@ -5,19 +5,13 @@
|
|||||||
- include_tasks: setup-Debian.yml
|
- include_tasks: setup-Debian.yml
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_os_family == 'Debian'
|
||||||
|
|
||||||
- name: Install Docker on CentOS/Redhat
|
- include_tasks: docker-redhat.yml
|
||||||
when: ansible_os_family == 'RedHat'
|
when: ansible_os_family == 'RedHat'
|
||||||
yum:
|
|
||||||
name:
|
|
||||||
- "docker-ce-selinux-{{ docker_package_version }}"
|
|
||||||
- "{{ docker_package }}-{{ docker_package_version }}"
|
|
||||||
conf_file: "{{ docker_yum_config }}"
|
|
||||||
state: "{{ docker_package_state }}"
|
|
||||||
|
|
||||||
- name: Install Docker.
|
- name: Install Docker.
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_os_family == 'Debian'
|
||||||
package:
|
package:
|
||||||
name: "{{ docker_package }}"
|
name: "{{ docker_package }}{{ '=' if docker_package_version }}{{ docker_package_version|default(omit) }}"
|
||||||
state: "{{ docker_package_state }}"
|
state: "{{ docker_package_state }}"
|
||||||
notify: restart docker
|
notify: restart docker
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user