richard
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update docker packages to 19.03.13 + add docker f32 (#6712)

pull/6736/head
Florian Ruynat 4 years ago
committed by GitHub
parent
9a8e4381be
commit
2eae207435
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 31 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      roles/container-engine/docker/defaults/main.yml
  2. 8
      roles/container-engine/docker/vars/debian.yml
  3. 19
      roles/container-engine/docker/vars/fedora.yml
  4. 10
      roles/container-engine/docker/vars/redhat.yml
  5. 8
      roles/container-engine/docker/vars/ubuntu-amd64.yml
  6. 8
      roles/container-engine/docker/vars/ubuntu-arm64.yml

4
roles/container-engine/docker/defaults/main.yml
View File

@ -30,9 +30,7 @@ yum_repo_dir: /etc/yum.repos.d
docker_yum_conf: /etc/yum_docker.conf docker_yum_conf: /etc/yum_docker.conf
# Fedora docker-ce repo # Fedora docker-ce repo
# TODO Remove the line below as soon as docker rpm are available for f32
docker_fedora_release: "{{ '31' if (ansible_distribution_major_version | int) > 31 else ansible_distribution_major_version }}"
docker_fedora_repo_base_url: 'https://download.docker.com/linux/fedora/{{ docker_fedora_release }}/$basearch/stable'
docker_fedora_repo_base_url: 'https://download.docker.com/linux/fedora/{{ ansible_distribution_major_version }}/$basearch/stable'
docker_fedora_repo_gpgkey: 'https://download.docker.com/linux/fedora/gpg' docker_fedora_repo_gpgkey: 'https://download.docker.com/linux/fedora/gpg'
# CentOS/RedHat docker-ce repo # CentOS/RedHat docker-ce repo
docker_rh_repo_base_url: 'https://download.docker.com/linux/centos/7/$basearch/stable' docker_rh_repo_base_url: 'https://download.docker.com/linux/centos/7/$basearch/stable'

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

@ -12,14 +12,14 @@ docker_versioned_pkg:
'18.03': docker-ce=18.03.1~ce-0~debian '18.03': docker-ce=18.03.1~ce-0~debian
'18.06': docker-ce=18.06.2~ce~3-0~debian '18.06': docker-ce=18.06.2~ce~3-0~debian
'18.09': docker-ce=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }} '18.09': docker-ce=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.12~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.12~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.12~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg: docker_cli_versioned_pkg:
'latest': docker-ce-cli 'latest': docker-ce-cli
'18.09': docker-ce-cli=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }} '18.09': docker-ce-cli=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.12~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}
docker_package_info: docker_package_info:
pkg_mgr: apt pkg_mgr: apt

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

@ -1,24 +1,21 @@
--- ---
docker_kernel_min_version: '0' docker_kernel_min_version: '0'
# TODO Remove the line below as soon as docker rpm are available for f32
fedora_distribution_package: "{{ '31' if (ansible_distribution_major_version | int) > 31 else ansible_distribution_major_version }}"
# https://docs.docker.com/install/linux/docker-ce/fedora/ # https://docs.docker.com/install/linux/docker-ce/fedora/
# https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/ # https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/
docker_versioned_pkg: docker_versioned_pkg:
'latest': docker-ce 'latest': docker-ce
'18.03': docker-ce-18.03.1.ce-3.fc{{ fedora_distribution_package }}
'18.06': docker-ce-18.06.2.ce-3.fc{{ fedora_distribution_package }}
'18.09': docker-ce-18.09.7-3.fc{{ fedora_distribution_package }}
'19.03': docker-ce-19.03.12-3.fc{{ fedora_distribution_package }}
'stable': docker-ce-19.03.12-3.fc{{ fedora_distribution_package }}
'edge': docker-ce-19.03.12-3.fc{{ fedora_distribution_package }}
'18.03': docker-ce-18.03.1.ce-3.fc{{ ansible_distribution_major_version }}
'18.06': docker-ce-18.06.2.ce-3.fc{{ ansible_distribution_major_version }}
'18.09': docker-ce-18.09.7-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-19.03.13-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-19.03.13-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-19.03.13-3.fc{{ ansible_distribution_major_version }}
docker_cli_versioned_pkg: docker_cli_versioned_pkg:
'latest': docker-ce-cli 'latest': docker-ce-cli
'18.09': docker-ce-cli-19.03.12-3.fc{{ fedora_distribution_package }}
'19.03': docker-ce-cli-19.03.12-3.fc{{ fedora_distribution_package }}
'18.09': docker-ce-cli-19.03.13-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-cli-19.03.13-3.fc{{ ansible_distribution_major_version }}
docker_package_info: docker_package_info:
pkg_mgr: dnf pkg_mgr: dnf

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

@ -2,7 +2,7 @@
docker_kernel_min_version: '0' docker_kernel_min_version: '0'
# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
# https://download.docker.com/linux/centos/7/x86_64/stable/Packages/
# https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/
# or do 'yum --showduplicates list docker-engine' # or do 'yum --showduplicates list docker-engine'
docker_versioned_pkg: docker_versioned_pkg:
'latest': docker-ce 'latest': docker-ce
@ -12,14 +12,14 @@ docker_versioned_pkg:
'18.03': docker-ce-18.03.1.ce-1.el7.centos '18.03': docker-ce-18.03.1.ce-1.el7.centos
'18.06': docker-ce-18.06.3.ce-3.el7 '18.06': docker-ce-18.06.3.ce-3.el7
'18.09': docker-ce-18.09.9-3.el7 '18.09': docker-ce-18.09.9-3.el7
'19.03': docker-ce-19.03.12-3.el7
'stable': docker-ce-19.03.12-3.el7
'edge': docker-ce-19.03.12-3.el7
'19.03': docker-ce-19.03.13-3.el7
'stable': docker-ce-19.03.13-3.el7
'edge': docker-ce-19.03.13-3.el7
docker_cli_versioned_pkg: docker_cli_versioned_pkg:
'latest': docker-ce-cli 'latest': docker-ce-cli
'18.09': docker-ce-cli-18.09.9-3.el7 '18.09': docker-ce-cli-18.09.9-3.el7
'19.03': docker-ce-cli-19.03.12-3.el7
'19.03': docker-ce-cli-19.03.13-3.el7
docker_selinux_versioned_pkg: docker_selinux_versioned_pkg:
'latest': docker-ce-selinux-17.03.3.ce-1.el7 'latest': docker-ce-selinux-17.03.3.ce-1.el7

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

@ -12,14 +12,14 @@ docker_versioned_pkg:
'17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }} '17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
'18.06': docker-ce=18.06.2~ce~3-0~ubuntu '18.06': docker-ce=18.06.2~ce~3-0~ubuntu
'18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }} '18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg: docker_cli_versioned_pkg:
'latest': docker-ce-cli 'latest': docker-ce-cli
'18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }} '18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_package_info: docker_package_info:
pkg_mgr: apt pkg_mgr: apt

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

@ -8,14 +8,14 @@ docker_versioned_pkg:
'17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }} '17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
'18.06': docker-ce=18.06.2~ce~3-0~ubuntu '18.06': docker-ce=18.06.2~ce~3-0~ubuntu
'18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }} '18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg: docker_cli_versioned_pkg:
'latest': docker-ce-cli 'latest': docker-ce-cli
'18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }} '18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.12~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_package_info: docker_package_info:
pkg_mgr: apt pkg_mgr: apt

Write Preview
Loading…
Cancel
Save