External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-15 10:10:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Docker: replace the use of containerd_version with docker_containerd_version to avoid causing conflicts when bumping containerd_version (#8130)

Browse Source
This commit is contained in:
Cristian Calin
2021-11-09 01:56:49 +02:00
committed by GitHub
parent 65540c5771
commit 4a8757161e
19 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/container-engine/docker/vars/debian-stretch.yml
View File

@@ -28,7 +28,7 @@ docker_cli_versioned_pkg:
docker_package_info:
pkgs:
- "{{ containerd_versioned_pkg[containerd_version | string] }}"
- "{{ containerd_versioned_pkg[docker_containerd_version | string] }}"
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
- "{{ docker_versioned_pkg[docker_version | string] }}"

2
roles/container-engine/docker/vars/debian.yml
View File

@@ -30,7 +30,7 @@ docker_cli_versioned_pkg:
docker_package_info:
pkgs:
- "{{ containerd_versioned_pkg[containerd_version | string] }}"
- "{{ containerd_versioned_pkg[docker_containerd_version | string] }}"
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
- "{{ docker_versioned_pkg[docker_version | string] }}"

2
roles/container-engine/docker/vars/fedora.yml
View File

@@ -30,6 +30,6 @@ docker_cli_versioned_pkg:
docker_package_info:
enablerepo: "docker-ce"
pkgs:
- "{{ containerd_versioned_pkg[containerd_version | string] }}"
- "{{ containerd_versioned_pkg[docker_containerd_version | string] }}"
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
- "{{ docker_versioned_pkg[docker_version | string] }}"

2
roles/container-engine/docker/vars/redhat.yml
View File

@@ -33,6 +33,6 @@ docker_cli_versioned_pkg:
docker_package_info:
enablerepo: "docker-ce"
pkgs:
- "{{ containerd_versioned_pkg[containerd_version | string] }}"
- "{{ containerd_versioned_pkg[docker_containerd_version | string] }}"
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
- "{{ docker_versioned_pkg[docker_version | string] }}"

2
roles/container-engine/docker/vars/ubuntu-16.yml
View File

@@ -29,7 +29,7 @@ docker_cli_versioned_pkg:
docker_package_info:
pkgs:
- "{{ containerd_versioned_pkg[containerd_version | string] }}"
- "{{ containerd_versioned_pkg[docker_containerd_version | string] }}"
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
- "{{ docker_versioned_pkg[docker_version | string] }}"

2
roles/container-engine/docker/vars/ubuntu.yml
View File

@@ -30,7 +30,7 @@ docker_cli_versioned_pkg:
docker_package_info:
pkgs:
- "{{ containerd_versioned_pkg[containerd_version | string] }}"
- "{{ containerd_versioned_pkg[docker_containerd_version | string] }}"
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
- "{{ docker_versioned_pkg[docker_version | string] }}"