mirror of
https://github.com/geerlingguy/ansible-role-docker.git
synced 2025-08-11 13:46:32 +02:00
Fix: docker_package_version fubar
This commit is contained in:
parent
a81f0afd18
commit
6ec0977b17
@ -3,7 +3,7 @@
|
||||
docker_edition: 'ce'
|
||||
docker_package: "docker-{{ docker_edition }}"
|
||||
docker_package_state: present
|
||||
docker_package_version: nil
|
||||
docker_package_version: ''
|
||||
|
||||
# Service options.
|
||||
docker_service_state: started
|
||||
|
@ -1,14 +1,14 @@
|
||||
---
|
||||
- name: Set Docker package name
|
||||
set_fact:
|
||||
docker_install_name: "{{ docker_package }}{{ '-' if docker_package_version }}{{ docker_package_version|default(omit) }}"
|
||||
docker_install_name: "{{ docker_package }}{{ '-' if docker_package_version else ''}}{{ docker_package_version }}"
|
||||
|
||||
- name: Check all the facts
|
||||
debug:
|
||||
msg: "Package: {{ docker_install_name }}, Is bigger then 18.01: {{ docker_package_version is version('18.01', '>=') }}"
|
||||
# - 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', '<')
|
||||
when: docker_package_version and docker_package_version is version('17.03', '>=') and docker_package_version is version('18.01', '<')
|
||||
yum:
|
||||
name:
|
||||
- "docker-ce-selinux-{{ docker_package_version }}"
|
||||
@ -18,7 +18,7 @@
|
||||
notify: restart docker
|
||||
|
||||
- name: Install Docker on CentOS/Redhat
|
||||
when: docker_package_version is none or docker_package_version is version('18.01', '>=')
|
||||
when: not docker_package_version or docker_package_version is version('18.01', '>=')
|
||||
package:
|
||||
name: "{{ docker_install_name }}"
|
||||
state: "{{ docker_package_state }}"
|
||||
|
Loading…
Reference in New Issue
Block a user