From 9416c9aa861b5ee30de1aa4d24581a2754408a39 Mon Sep 17 00:00:00 2001
From: Victor Morales <chipahuac@hotmail.com>
Date: Mon, 27 Sep 2021 10:44:19 -0700
Subject: [PATCH] Enable stable and edge Docker CLI versions (#8019)
---
roles/container-engine/docker/vars/debian-stretch.yml | 2 ++
roles/container-engine/docker/vars/debian.yml | 2 ++
roles/container-engine/docker/vars/fedora.yml | 2 ++
roles/container-engine/docker/vars/redhat.yml | 2 ++
roles/container-engine/docker/vars/ubuntu-16.yml | 2 ++
roles/container-engine/docker/vars/ubuntu.yml | 2 ++
6 files changed, 12 insertions(+)
diff --git a/roles/container-engine/docker/vars/debian-stretch.yml b/roles/container-engine/docker/vars/debian-stretch.yml
index 9ff8ac142..2b111ea0a 100644
--- a/roles/container-engine/docker/vars/debian-stretch.yml
+++ b/roles/container-engine/docker/vars/debian-stretch.yml
@@ -14,6 +14,8 @@ 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.15~3-0~debian-{{ ansible_distribution_release|lower }}
+ 'stable': docker-ce-cli=5:19.03.15~3-0~debian-{{ ansible_distribution_release|lower }}
+ 'edge': docker-ce-cli=5:19.03.15~3-0~debian-{{ ansible_distribution_release|lower }}
docker_package_info:
pkgs:
diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml
index a66834bfc..13bf81f75 100644
--- a/roles/container-engine/docker/vars/debian.yml
+++ b/roles/container-engine/docker/vars/debian.yml
@@ -13,6 +13,8 @@ docker_cli_versioned_pkg:
'18.09': docker-ce-cli=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.15~3-0~debian-{{ ansible_distribution_release|lower }}
'20.10': docker-ce-cli=5:20.10.8~3-0~debian-{{ ansible_distribution_release|lower }}
+ 'stable': docker-ce-cli=5:20.10.8~3-0~debian-{{ ansible_distribution_release|lower }}
+ 'edge': docker-ce-cli=5:20.10.8~3-0~debian-{{ ansible_distribution_release|lower }}
docker_package_info:
pkgs:
diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml
index 1d350f3f3..92b97a29d 100644
--- a/roles/container-engine/docker/vars/fedora.yml
+++ b/roles/container-engine/docker/vars/fedora.yml
@@ -12,6 +12,8 @@ docker_cli_versioned_pkg:
'latest': docker-ce-cli
'19.03': docker-ce-cli-19.03.15-3.fc{{ ansible_distribution_major_version }}
'20.10': docker-ce-cli-20.10.8-3.fc{{ ansible_distribution_major_version }}
+ 'stable': docker-ce-cli-20.10.8-3.fc{{ ansible_distribution_major_version }}
+ 'edge': docker-ce-cli-20.10.8-3.fc{{ ansible_distribution_major_version }}
docker_package_info:
enablerepo: "docker-ce"
diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml
index 6e3e1e83f..9fff76cbd 100644
--- a/roles/container-engine/docker/vars/redhat.yml
+++ b/roles/container-engine/docker/vars/redhat.yml
@@ -15,6 +15,8 @@ docker_cli_versioned_pkg:
'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.8-3.el{{ ansible_distribution_major_version }}
+ 'stable': docker-ce-cli-20.10.8-3.el{{ ansible_distribution_major_version }}
+ 'edge': docker-ce-cli-20.10.8-3.el{{ ansible_distribution_major_version }}
docker_package_info:
enablerepo: "docker-ce"
diff --git a/roles/container-engine/docker/vars/ubuntu-16.yml b/roles/container-engine/docker/vars/ubuntu-16.yml
index 4d364c956..f37413820 100644
--- a/roles/container-engine/docker/vars/ubuntu-16.yml
+++ b/roles/container-engine/docker/vars/ubuntu-16.yml
@@ -13,6 +13,8 @@ docker_cli_versioned_pkg:
'18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.15~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'20.10': docker-ce-cli=5:20.10.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+ 'stable': docker-ce-cli=5:20.10.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+ 'edge': docker-ce-cli=5:20.10.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_package_info:
pkgs:
diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml
index 69d2d5b2d..ba630fc5d 100644
--- a/roles/container-engine/docker/vars/ubuntu.yml
+++ b/roles/container-engine/docker/vars/ubuntu.yml
@@ -13,6 +13,8 @@ docker_cli_versioned_pkg:
'18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.15~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'20.10': docker-ce-cli=5:20.10.8~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+ 'stable': docker-ce-cli=5:20.10.8~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+ 'edge': docker-ce-cli=5:20.10.8~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_package_info:
pkgs:
--
GitLab