From d25ecfe1c121e752ddbb0fa5a675a9b9be06a49b Mon Sep 17 00:00:00 2001
From: Chad Swenson <chadswen@gmail.com>
Date: Wed, 24 Apr 2019 00:24:01 -0500
Subject: [PATCH] Update Docker defaults to 18.09.5 and drop deprecated (#4624)
As of kubernetes v1.14, docker 18.09 is [validated for use](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.14.md#external-dependencies). Docker 1.11 and 1.12 were dropped.
This patch:
- Updates the default docker version to 18.09
- Updates Docker packages to the latest 18.09 patch (18.09.5)
- Removes options for Docker 1.11 and 1.12
---
roles/container-engine/docker/defaults/main.yml | 2 +-
roles/container-engine/docker/vars/debian.yml | 8 +++-----
roles/container-engine/docker/vars/fedora.yml | 2 ++
roles/container-engine/docker/vars/redhat.yml | 10 +++-------
roles/container-engine/docker/vars/ubuntu-amd64.yml | 6 +++---
roles/container-engine/docker/vars/ubuntu-arm64.yml | 8 ++++----
6 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml
index d771806c7..ab9a4fb74 100644
--- a/roles/container-engine/docker/defaults/main.yml
+++ b/roles/container-engine/docker/defaults/main.yml
@@ -1,5 +1,5 @@
---
-docker_version: '18.06'
+docker_version: '18.09'
docker_selinux_version: '17.03'
docker_package_info:
diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml
index 0c483d757..eaa78a432 100644
--- a/roles/container-engine/docker/vars/debian.yml
+++ b/roles/container-engine/docker/vars/debian.yml
@@ -5,8 +5,6 @@ docker_kernel_min_version: '3.10'
# https://apt.dockerproject.org/repo/dists/debian-wheezy/main/filelist
docker_versioned_pkg:
'latest': docker-ce
- '1.11': docker-engine=1.11.2-0~{{ ansible_distribution_release|lower }}
- '1.12': docker-engine=1.12.6-0~debian-{{ ansible_distribution_release|lower }}
'1.13': docker-engine=1.13.1-0~debian-{{ ansible_distribution_release|lower }}
'17.03': docker-ce=17.03.2~ce-0~debian-{{ ansible_distribution_release|lower }}
'17.06': docker-ce=17.06.2~ce-0~debian
@@ -14,9 +12,9 @@ docker_versioned_pkg:
'17.12': docker-ce=17.12.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.09': docker-ce=5:18.09.2~3-0~debian-{{ ansible_distribution_release|lower }}
- 'stable': docker-ce=18.06.2~ce~3-0~debian
- 'edge': docker-ce=17.12.1~ce-0~debian
+ '18.09': docker-ce=5:18.09.5~3-0~debian-{{ ansible_distribution_release|lower }}
+ 'stable': docker-ce=5:18.09.5~3-0~debian-{{ ansible_distribution_release|lower }}
+ 'edge': docker-ce=5:18.09.5~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 3fe6a0422..5fbfe4450 100644
--- a/roles/container-engine/docker/vars/fedora.yml
+++ b/roles/container-engine/docker/vars/fedora.yml
@@ -2,11 +2,13 @@
docker_kernel_min_version: '0'
# https://docs.docker.com/install/linux/docker-ce/fedora/
+# https://download.docker.com/linux/fedora/28/x86_64/stable/Packages/
docker_versioned_pkg:
'latest': docker-ce
'18.03': docker-ce-18.03.1.ce-3.fc28
'18.06': docker-ce-18.06.2.ce-3.fc28
+ '18.09': docker-ce-18.09.5-3.fc28
#
# This is due to the fact that the docker
diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml
index 149ab4734..0989316d7 100644
--- a/roles/container-engine/docker/vars/redhat.yml
+++ b/roles/container-engine/docker/vars/redhat.yml
@@ -7,22 +7,18 @@ docker_kernel_min_version: '0'
# or do 'yum --showduplicates list docker-engine'
docker_versioned_pkg:
'latest': docker-ce
- '1.11': docker-engine-1.11.2-1.el7.centos
- '1.12': docker-engine-1.12.6-1.el7.centos
'1.13': docker-engine-1.13.1-1.el7.centos
'17.03': docker-ce-17.03.2.ce-1.el7.centos
'17.09': docker-ce-17.09.0.ce-1.el7.centos
'17.12': docker-ce-17.12.1.ce-1.el7.centos
'18.03': docker-ce-18.03.1.ce-1.el7.centos
'18.06': docker-ce-18.06.2.ce-3.el7
- '18.09': docker-ce-18.09.2-3.el7
- 'stable': docker-ce-18.06.2.ce-3.el7
- 'edge': docker-ce-18.09.2-3.el7
+ '18.09': docker-ce-18.09.5-3.el7
+ 'stable': docker-ce-18.09.5-3.el7
+ 'edge': docker-ce-18.09.5-3.el7
docker_selinux_versioned_pkg:
'latest': docker-ce-selinux
- '1.11': docker-engine-selinux-1.11.2-1.el7.centos
- '1.12': docker-engine-selinux-1.12.6-1.el7.centos
'1.13': docker-engine-selinux-1.13.1-1.el7.centos
'17.03': docker-ce-selinux-17.03.2.ce-1.el7.centos
'stable': docker-ce-selinux-17.03.2.ce-1.el7.centos
diff --git a/roles/container-engine/docker/vars/ubuntu-amd64.yml b/roles/container-engine/docker/vars/ubuntu-amd64.yml
index 2f491f70c..881a39478 100644
--- a/roles/container-engine/docker/vars/ubuntu-amd64.yml
+++ b/roles/container-engine/docker/vars/ubuntu-amd64.yml
@@ -11,9 +11,9 @@ docker_versioned_pkg:
'17.09': docker-ce=17.09.0~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.09': docker-ce=5:18.09.2~3-0~ubuntu-{{ ansible_distribution_release|lower }}
- 'stable': docker-ce=18.06.2~ce~3-0~ubuntu
- 'edge': docker-ce=5:18.09.2~ce~3-0~ubuntu
+ '18.09': docker-ce=5:18.09.5~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+ 'stable': docker-ce=5:18.09.5~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+ 'edge': docker-ce=5:18.09.5~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 e73eea7e8..8a4070cca 100644
--- a/roles/container-engine/docker/vars/ubuntu-arm64.yml
+++ b/roles/container-engine/docker/vars/ubuntu-arm64.yml
@@ -1,15 +1,15 @@
---
docker_kernel_min_version: '3.10'
-docker_version: 18.06
+
# https://download.docker.com/linux/ubuntu/
docker_versioned_pkg:
'latest': docker-ce
'17.09': docker-ce=17.09.1~ce-0~ubuntu
'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.2~3-0~ubuntu-{{ ansible_distribution_release|lower }}
- 'stable': docker-ce=18.06.2~ce~3-0~ubuntu
- 'edge': docker-ce=5:18.09.2~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+ '18.09': docker-ce=5:18.09.5~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+ 'stable': docker-ce=5:18.09.5~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+ 'edge': docker-ce=5:18.09.5~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_package_info:
pkg_mgr: apt
--
GitLab