C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add epoch to docker-ce and docker-ce-cli packages to ensure docker up… (#8618)

Browse source 
* Add epoch to docker-ce and docker-ce-cli packages to ensure docker upgrade

* Split container-engine redhat vars to support legacy RHEL 7 version management

* Support ansible_distribution_major_version when disvering vars with ansible_os_family
This commit is contained in:
Unai Arríen 2022-03-11 11:45:07 +01:00 committed by GitHub
parent 5a49ac52f9
commit 4b6892ece9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/container-engine/docker/tasks/main.yml
View file

@ -21,6 +21,7 @@
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version|lower|replace('/', '_') }}.yml"
- "{{ ansible_distribution|lower }}-{{ host_architecture }}.yml"
- "{{ ansible_distribution|lower }}.yml"
- "{{ ansible_os_family|lower }}-{{ ansible_distribution_major_version|lower|replace('/', '_') }}.yml"
- "{{ ansible_os_family|lower }}-{{ host_architecture }}.yml"
- "{{ ansible_os_family|lower }}.yml"
- defaults.yml

39
roles/container-engine/docker/vars/redhat-7.yml Normal file
View file

@ -0,0 +1,39 @@
---
# containerd versions are only relevant for docker
containerd_versioned_pkg:
'latest': "{{ containerd_package }}"
'1.3.7': "{{ containerd_package }}-1.3.7-3.1.el7"
'1.3.9': "{{ containerd_package }}-1.3.9-3.1.el7"
'1.4.3': "{{ containerd_package }}-1.4.3-3.2.el7"
'1.4.4': "{{ containerd_package }}-1.4.4-3.1.el7"
'1.4.6': "{{ containerd_package }}-1.4.6-3.1.el7"
'1.4.9': "{{ containerd_package }}-1.4.9-3.1.el7"
'1.4.12': "{{ containerd_package }}-1.4.12-3.1.el7"
'stable': "{{ containerd_package }}-1.4.12-3.1.el7"
'edge': "{{ containerd_package }}-1.4.12-3.1.el7"
# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
# https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/
# or do 'yum --showduplicates list docker-engine'
docker_versioned_pkg:
'latest': docker-ce
'18.09': docker-ce-18.09.9-3.el7
'19.03': docker-ce-19.03.15-3.el7
'20.10': docker-ce-20.10.11-3.el7
'stable': docker-ce-20.10.11-3.el7
'edge': docker-ce-20.10.11-3.el7
docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli-18.09.9-3.el7
'19.03': docker-ce-cli-19.03.15-3.el7
'20.10': docker-ce-cli-20.10.11-3.el7
'stable': docker-ce-cli-20.10.11-3.el7
'edge': docker-ce-cli-20.10.11-3.el7
docker_package_info:
enablerepo: "docker-ce"
pkgs:
- "{{ containerd_versioned_pkg[docker_containerd_version | string] }}"
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
- "{{ docker_versioned_pkg[docker_version | string] }}"

20
roles/container-engine/docker/vars/redhat.yml
View file

@ -17,19 +17,19 @@ containerd_versioned_pkg:
# or do 'yum --showduplicates list docker-engine'
docker_versioned_pkg:
'latest': docker-ce
'18.09': docker-ce-18.09.9-3.el7
'19.03': docker-ce-19.03.15-3.el{{ ansible_distribution_major_version }}
'20.10': docker-ce-20.10.11-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-20.10.11-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-20.10.11-3.el{{ ansible_distribution_major_version }}
'18.09': docker-ce-3:18.09.9-3.el7
'19.03': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
'20.10': docker-ce-3:20.10.11-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-3:20.10.11-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-3:20.10.11-3.el{{ ansible_distribution_major_version }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli-18.09.9-3.el7
'19.03': docker-ce-cli-19.03.15-3.el{{ ansible_distribution_major_version }}
'20.10': docker-ce-cli-20.10.11-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-cli-20.10.11-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-cli-20.10.11-3.el{{ ansible_distribution_major_version }}
'18.09': docker-ce-cli-1:18.09.9-3.el7
'19.03': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
'20.10': docker-ce-cli-1:20.10.11-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-cli-1:20.10.11-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-cli-1:20.10.11-3.el{{ ansible_distribution_major_version }}
docker_package_info:
enablerepo: "docker-ce"