mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-01-31 17:19:17 -03:30
docker: use package instead of action, cleanup
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
19a61d838f
commit
0e96852159
@@ -9,6 +9,5 @@ docker_versioned_pkg:
|
||||
docker_version: "latest"
|
||||
|
||||
docker_package_info:
|
||||
pkg_mgr: yum
|
||||
pkgs:
|
||||
- name: "{{ docker_versioned_pkg[docker_version | string] }}"
|
||||
- "{{ docker_versioned_pkg[docker_version | string] }}"
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
---
|
||||
docker_package_info:
|
||||
pkg_mgr: swupd
|
||||
pkgs:
|
||||
- name: "containers-basic"
|
||||
- "containers-basic"
|
||||
|
||||
@@ -15,11 +15,10 @@ docker_cli_versioned_pkg:
|
||||
'20.10': docker-ce-cli=5:20.10.2~3-0~debian-{{ ansible_distribution_release|lower }}
|
||||
|
||||
docker_package_info:
|
||||
pkg_mgr: apt
|
||||
pkgs:
|
||||
- name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
|
||||
- name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
|
||||
- name: "{{ docker_versioned_pkg[docker_version | string] }}"
|
||||
- "{{ containerd_versioned_pkg[containerd_version | string] }}"
|
||||
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
|
||||
- "{{ docker_versioned_pkg[docker_version | string] }}"
|
||||
|
||||
docker_repo_key_info:
|
||||
pkg_key: apt_key
|
||||
|
||||
@@ -14,8 +14,8 @@ docker_cli_versioned_pkg:
|
||||
'20.10': docker-ce-cli-20.10.2-3.fc{{ ansible_distribution_major_version }}
|
||||
|
||||
docker_package_info:
|
||||
pkg_mgr: dnf
|
||||
enablerepo: "docker-ce"
|
||||
pkgs:
|
||||
- name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
|
||||
- name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
|
||||
- name: "{{ docker_versioned_pkg[docker_version | string] }}"
|
||||
- "{{ containerd_versioned_pkg[containerd_version | string] }}"
|
||||
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
|
||||
- "{{ docker_versioned_pkg[docker_version | string] }}"
|
||||
|
||||
@@ -17,14 +17,11 @@ docker_cli_versioned_pkg:
|
||||
'20.10': docker-ce-cli-20.10.2-3.el{{ ansible_distribution_major_version }}
|
||||
|
||||
docker_package_info:
|
||||
pkg_mgr: yum
|
||||
enablerepo: "docker-ce"
|
||||
pkgs:
|
||||
- name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
|
||||
repo: "docker-ce"
|
||||
- name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
|
||||
repo: "docker-ce"
|
||||
- name: "{{ docker_versioned_pkg[docker_version | string] }}"
|
||||
repo: "docker-ce"
|
||||
- "{{ containerd_versioned_pkg[containerd_version | string] }}"
|
||||
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
|
||||
- "{{ docker_versioned_pkg[docker_version | string] }}"
|
||||
|
||||
docker_repo_key_info:
|
||||
pkg_key: ''
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
---
|
||||
docker_package_info:
|
||||
pkg_mgr: zypper
|
||||
state: latest
|
||||
pkgs:
|
||||
- name: docker
|
||||
- name: containerd
|
||||
state: latest
|
||||
- docker
|
||||
- containerd
|
||||
|
||||
docker_repo_key_info:
|
||||
pkg_key: ''
|
||||
|
||||
@@ -15,11 +15,10 @@ docker_cli_versioned_pkg:
|
||||
'20.10': docker-ce-cli=5:20.10.2~3-0~ubuntu-{{ ansible_distribution_release|lower }}
|
||||
|
||||
docker_package_info:
|
||||
pkg_mgr: apt
|
||||
pkgs:
|
||||
- name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
|
||||
- name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
|
||||
- name: "{{ docker_versioned_pkg[docker_version | string] }}"
|
||||
- "{{ containerd_versioned_pkg[containerd_version | string] }}"
|
||||
- "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
|
||||
- "{{ docker_versioned_pkg[docker_version | string] }}"
|
||||
|
||||
docker_repo_key_info:
|
||||
pkg_key: apt_key
|
||||
|
||||
Reference in New Issue
Block a user