From 2eae20743571d4a20b282e70839bb5de53abd944 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Wed, 23 Sep 2020 17:32:19 +0200
Subject: [PATCH] Update docker packages to 19.03.13 + add docker f32 (#6712)
---
.../container-engine/docker/defaults/main.yml | 4 +---
roles/container-engine/docker/vars/debian.yml | 8 ++++----
roles/container-engine/docker/vars/fedora.yml | 19 ++++++++-----------
roles/container-engine/docker/vars/redhat.yml | 10 +++++-----
.../docker/vars/ubuntu-amd64.yml | 8 ++++----
.../docker/vars/ubuntu-arm64.yml | 8 ++++----
6 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml
index f37608889..bc96dc8de 100644
--- a/roles/container-engine/docker/defaults/main.yml
+++ b/roles/container-engine/docker/defaults/main.yml
@@ -30,9 +30,7 @@ yum_repo_dir: /etc/yum.repos.d
docker_yum_conf: /etc/yum_docker.conf
# 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'
# CentOS/RedHat docker-ce repo
docker_rh_repo_base_url: 'https://download.docker.com/linux/centos/7/$basearch/stable'
diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml
index dd39f8788..e1221f3a7 100644
--- a/roles/container-engine/docker/vars/debian.yml
+++ b/roles/container-engine/docker/vars/debian.yml
@@ -12,14 +12,14 @@ docker_versioned_pkg:
'18.03': docker-ce=18.03.1~ce-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 }}
- '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:
'latest': docker-ce-cli
'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:
pkg_mgr: apt
diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml
index fe10770b4..9050b5817 100644
--- a/roles/container-engine/docker/vars/fedora.yml
+++ b/roles/container-engine/docker/vars/fedora.yml
@@ -1,24 +1,21 @@
---
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://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/
docker_versioned_pkg:
'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:
'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:
pkg_mgr: dnf
diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml
index 7e24349b4..1a4988843 100644
--- a/roles/container-engine/docker/vars/redhat.yml
+++ b/roles/container-engine/docker/vars/redhat.yml
@@ -2,7 +2,7 @@
docker_kernel_min_version: '0'
# 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'
docker_versioned_pkg:
'latest': docker-ce
@@ -12,14 +12,14 @@ docker_versioned_pkg:
'18.03': docker-ce-18.03.1.ce-1.el7.centos
'18.06': docker-ce-18.06.3.ce-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:
'latest': docker-ce-cli
'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:
'latest': docker-ce-selinux-17.03.3.ce-1.el7
diff --git a/roles/container-engine/docker/vars/ubuntu-amd64.yml b/roles/container-engine/docker/vars/ubuntu-amd64.yml
index fcc6d140f..f1f76df78 100644
--- a/roles/container-engine/docker/vars/ubuntu-amd64.yml
+++ b/roles/container-engine/docker/vars/ubuntu-amd64.yml
@@ -12,14 +12,14 @@ docker_versioned_pkg:
'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.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:
'latest': docker-ce-cli
'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:
pkg_mgr: apt
diff --git a/roles/container-engine/docker/vars/ubuntu-arm64.yml b/roles/container-engine/docker/vars/ubuntu-arm64.yml
index b65a5b4c2..60b7f8c1f 100644
--- a/roles/container-engine/docker/vars/ubuntu-arm64.yml
+++ b/roles/container-engine/docker/vars/ubuntu-arm64.yml
@@ -8,14 +8,14 @@ docker_versioned_pkg:
'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.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:
'latest': docker-ce-cli
'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:
pkg_mgr: apt
--
GitLab