From dbf40bbbb80eb8221d6dc5dc2d553e774ae34213 Mon Sep 17 00:00:00 2001
From: RongZhang <rong.zhang@easystack.cn>
Date: Wed, 7 Mar 2018 06:11:20 -0600
Subject: [PATCH] docker-ce instead of docker-engine repo (#2423)
* Use docker-ce 17.03.2
* Docker-engine may be discarded
---
roles/docker/defaults/main.yml | 14 ++++++++++----
roles/docker/vars/debian.yml | 20 ++++++++++----------
roles/docker/vars/redhat.yml | 20 +++++++++++++-------
roles/docker/vars/ubuntu.yml | 18 ++++++++----------
4 files changed, 41 insertions(+), 31 deletions(-)
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index e49471ccc..2bbd62835 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -1,5 +1,6 @@
---
docker_version: '17.03'
+docker_selinux_version: '17.03'
docker_package_info:
pkgs:
@@ -14,7 +15,12 @@ docker_dns_servers_strict: yes
docker_container_storage_setup: false
-docker_rh_repo_base_url: 'https://yum.dockerproject.org/repo/main/centos/7'
-docker_rh_repo_gpgkey: 'https://yum.dockerproject.org/gpg'
-docker_apt_repo_base_url: 'https://apt.dockerproject.org/repo'
-docker_apt_repo_gpgkey: 'https://apt.dockerproject.org/gpg'
+#CentOS/RedHat docker-ce repo
+docker_rh_repo_base_url: 'https://download.docker.com/linux/centos/7/$basearch/stable'
+docker_rh_repo_gpgkey: 'https://download.docker.com/linux/centos/gpg'
+#Ubuntu docker-ce repo
+docker_ubuntu_repo_base_url: "https://download.docker.com/linux/ubuntu"
+docker_ubuntu_repo_gpgkey: 'https://download.docker.com/linux/ubuntu/gpg'
+#Debian docker-ce repo
+docker_debian_repo_base_url: "https://download.docker.com/linux/debian"
+docker_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
diff --git a/roles/docker/vars/debian.yml b/roles/docker/vars/debian.yml
index 587e910d6..0a43c7c79 100644
--- a/roles/docker/vars/debian.yml
+++ b/roles/docker/vars/debian.yml
@@ -1,15 +1,15 @@
---
docker_kernel_min_version: '3.10'
-# https://apt.dockerproject.org/repo/dists/debian-wheezy/main/filelist
+# https://download.docker.com/linux/debian/
docker_versioned_pkg:
- 'latest': docker-engine
+ '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-engine=17.03.1~ce-0~debian-{{ ansible_distribution_release|lower }}
- 'stable': docker-engine=17.03.1~ce-0~debian-{{ ansible_distribution_release|lower }}
- 'edge': docker-engine=17.05.0~ce-0~debian-{{ ansible_distribution_release|lower }}
+ '17.03': docker-ce=17.03.2~ce-0~debian-{{ ansible_distribution_release|lower }}
+ 'stable': docker-ce=17.03.2~ce-0~debian-{{ ansible_distribution_release|lower }}
+ 'edge': docker-ce=17.12.1~ce-0~debian-{{ ansible_distribution_release|lower }}
docker_package_info:
pkg_mgr: apt
@@ -19,14 +19,14 @@ docker_package_info:
docker_repo_key_info:
pkg_key: apt_key
- url: '{{ docker_apt_repo_gpgkey }}'
+ url: '{{ docker_debian_repo_gpgkey }}'
repo_keys:
- - 58118E89F3A912897C070ADBF76221572C52609D
+ - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
docker_repo_info:
pkg_repo: apt_repository
repos:
- >
- deb {{ docker_apt_repo_base_url }}
- {{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
- main
+ deb {{ docker_debian_repo_base_url }}
+ {{ ansible_distribution_release|lower }}
+ stable
diff --git a/roles/docker/vars/redhat.yml b/roles/docker/vars/redhat.yml
index 23c5419a6..96950719e 100644
--- a/roles/docker/vars/redhat.yml
+++ b/roles/docker/vars/redhat.yml
@@ -1,23 +1,29 @@
---
docker_kernel_min_version: '0'
-# https://yum.dockerproject.org/repo/main/centos/7/Packages/
+# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
+# https://download.docker.com/linux/centos/7/x86_64/stable/Packages/
# or do 'yum --showduplicates list docker-engine'
docker_versioned_pkg:
- 'latest': docker-engine
+ '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-engine-17.03.1.ce-1.el7.centos
- 'stable': docker-engine-17.03.1.ce-1.el7.centos
- 'edge': docker-engine-17.05.0.ce-1.el7.centos
+ '17.03': docker-ce-17.03.2.ce-1.el7.centos
+ 'stable': docker-ce-17.03.2.ce-1.el7.centos
+ 'edge': docker-ce-17.03.2.ce-1.el7.centos
+
+docker_selinux_versioned_pkg:
+ 'latest': docker-ce-selinux
+ '17.03': docker-ce-selinux-17.03.2.ce-1.el7.centos
+ 'stable': docker-ce-selinux-17.03.2.ce-1.el7.centos
+ 'edge': docker-ce-selinux-17.03.2.ce-1.el7.centos
-# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
-# https://download.docker.com/linux/centos/7/x86_64/stable/Packages/
docker_package_info:
pkg_mgr: yum
pkgs:
+ - name: "{{ docker_selinux_versioned_pkg[docker_selinux_version | string] }}"
- name: "{{ docker_versioned_pkg[docker_version | string] }}"
docker_repo_key_info:
diff --git a/roles/docker/vars/ubuntu.yml b/roles/docker/vars/ubuntu.yml
index f11f5bb81..897c23ce0 100644
--- a/roles/docker/vars/ubuntu.yml
+++ b/roles/docker/vars/ubuntu.yml
@@ -1,15 +1,13 @@
---
docker_kernel_min_version: '3.10'
-# https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist
+# https://download.docker.com/linux/ubuntu/
docker_versioned_pkg:
- 'latest': docker-engine
+ 'latest': docker-ce
'1.11': docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }}
'1.12': docker-engine=1.12.6-0~ubuntu-{{ ansible_distribution_release|lower }}
'1.13': docker-engine=1.13.1-0~ubuntu-{{ ansible_distribution_release|lower }}
- '17.03': docker-engine=17.03.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
- 'stable': docker-engine=17.03.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
- 'edge': docker-engine=17.05.0~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
+ '17.03': docker-ce=17.03.2~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_package_info:
pkg_mgr: apt
@@ -19,14 +17,14 @@ docker_package_info:
docker_repo_key_info:
pkg_key: apt_key
- url: '{{ docker_apt_repo_gpgkey }}'
+ url: '{{ docker_ubuntu_repo_gpgkey }}'
repo_keys:
- - 58118E89F3A912897C070ADBF76221572C52609D
+ - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
docker_repo_info:
pkg_repo: apt_repository
repos:
- >
- deb {{ docker_apt_repo_base_url }}
- {{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
- main
+ deb {{ docker_ubuntu_repo_base_url }}
+ {{ ansible_distribution_release|lower }}
+ stable
--
GitLab