Browse Source
Merge pull request #2613 from riverzhang/atomic-docker
Fix check docker error for atomic
pull/2628/head
Rong Zhang
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
7 additions and
2 deletions
-
roles/docker/tasks/pre-upgrade.yml
|
|
|
@ -6,7 +6,9 @@ |
|
|
|
with_items: |
|
|
|
- docker |
|
|
|
- docker-engine |
|
|
|
when: ansible_os_family == 'Debian' and (docker_versioned_pkg[docker_version | string] | search('docker-ce')) |
|
|
|
when: |
|
|
|
- ansible_os_family == 'Debian' |
|
|
|
- (docker_versioned_pkg[docker_version | string] | search('docker-ce')) |
|
|
|
|
|
|
|
- name: Ensure old versions of Docker are not installed. | RedHat |
|
|
|
package: |
|
|
|
@ -17,4 +19,7 @@ |
|
|
|
- docker-common |
|
|
|
- docker-engine |
|
|
|
- docker-selinux |
|
|
|
when: ansible_os_family == 'RedHat' and (docker_versioned_pkg[docker_version | string] | search('docker-ce')) |
|
|
|
when: |
|
|
|
- ansible_os_family == 'RedHat' |
|
|
|
- (docker_versioned_pkg[docker_version | string] | search('docker-ce')) |
|
|
|
- not is_atomic |
