From 8eb0957fe0098eccf46591670a3d1a820f86c06d Mon Sep 17 00:00:00 2001 From: David Crook Date: Thu, 2 Mar 2017 13:48:09 -0700 Subject: [PATCH 1/3] first pass at adding 'stable' and 'edge' version packages - Only have ubuntu to test on - fedora and redhat are placeholders/guesses - the "old" package repositories seem to have the "new" CE version which is `1.13.1` based - `docker-ce` looks like it is named as a backported `docker-engine` package in some places - Did not change the `defaults` version anywhere, so should work as before - Did not point to new package repositories, as existing ones have the new packages. --- roles/docker/vars/debian.yml | 2 ++ roles/docker/vars/fedora.yml | 6 ++++++ roles/docker/vars/redhat.yml | 7 +++++++ roles/docker/vars/ubuntu.yml | 2 ++ 4 files changed, 17 insertions(+) diff --git a/roles/docker/vars/debian.yml b/roles/docker/vars/debian.yml index 5089680b3..58471ff67 100644 --- a/roles/docker/vars/debian.yml +++ b/roles/docker/vars/debian.yml @@ -6,6 +6,8 @@ docker_versioned_pkg: '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 }} + 'stable': docker-ce=17.03.0~ce-0~debian-{{ ansible_distribution_release|lower }} + 'edge': docker-ce=17.03.0~ce-0~debian-{{ ansible_distribution_release|lower }} docker_package_info: pkg_mgr: apt diff --git a/roles/docker/vars/fedora.yml b/roles/docker/vars/fedora.yml index ce057cea0..f89c90a52 100644 --- a/roles/docker/vars/fedora.yml +++ b/roles/docker/vars/fedora.yml @@ -1,9 +1,15 @@ docker_kernel_min_version: '0' +# https://docs.docker.com/engine/installation/linux/fedora/#install-from-a-package +# https://download.docker.com/linux/fedora/7/x86_64/stable/ +# the package names below are guesses; +# docs mention `sudo dnf config-manager --enable docker-ce-edge` for edge docker_versioned_pkg: 'latest': docker '1.11': docker-1:1.11.2 '1.12': docker-1:1.12.5 + 'stable': docker-ce + 'edge': docker-ce-edge docker_package_info: pkg_mgr: dnf diff --git a/roles/docker/vars/redhat.yml b/roles/docker/vars/redhat.yml index 0fbc35087..87b93904b 100644 --- a/roles/docker/vars/redhat.yml +++ b/roles/docker/vars/redhat.yml @@ -7,6 +7,13 @@ docker_versioned_pkg: '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 + 'stable': docker-engine-17.03.0.ce-1.el7.centos + 'edge': docker-engine-17.03.0.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/ - guesses + # 'stable': docker-ce-17.03.0.el7.centos + # 'edge': docker-ce-17.03.0.el7.centos docker_package_info: pkg_mgr: yum diff --git a/roles/docker/vars/ubuntu.yml b/roles/docker/vars/ubuntu.yml index d0477c8d1..731418347 100644 --- a/roles/docker/vars/ubuntu.yml +++ b/roles/docker/vars/ubuntu.yml @@ -7,6 +7,8 @@ docker_versioned_pkg: '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 }} + 'stable': docker-ce=17.03.0~ce-0~ubuntu-{{ ansible_distribution_release|lower }} + 'edge': docker-ce=17.03.0~ce-0~ubuntu-{{ ansible_distribution_release|lower }} docker_package_info: pkg_mgr: apt From 32d1edf0b9a04ca46d86788b80b5b6bf38372283 Mon Sep 17 00:00:00 2001 From: David Crook Date: Mon, 6 Mar 2017 16:02:53 -0700 Subject: [PATCH 2/3] removed irrelevant comments --- roles/docker/vars/redhat.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/docker/vars/redhat.yml b/roles/docker/vars/redhat.yml index 87b93904b..7abf2cda7 100644 --- a/roles/docker/vars/redhat.yml +++ b/roles/docker/vars/redhat.yml @@ -11,9 +11,7 @@ docker_versioned_pkg: 'edge': docker-engine-17.03.0.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/ - guesses - # 'stable': docker-ce-17.03.0.el7.centos - # 'edge': docker-ce-17.03.0.el7.centos +# https://download.docker.com/linux/centos/7/x86_64/stable/Packages/ docker_package_info: pkg_mgr: yum From 9e6983a11f6901734b7b303f6a50ccf0ed3addbc Mon Sep 17 00:00:00 2001 From: David Crook Date: Mon, 6 Mar 2017 16:54:39 -0700 Subject: [PATCH 3/3] updated debian and ubuntu package names based on testing docker-ce is not the .deb package until the repositories are switched over to new "downloads" docker webserver --- roles/docker/vars/debian.yml | 4 ++-- roles/docker/vars/ubuntu.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/docker/vars/debian.yml b/roles/docker/vars/debian.yml index 58471ff67..a4689ffbc 100644 --- a/roles/docker/vars/debian.yml +++ b/roles/docker/vars/debian.yml @@ -6,8 +6,8 @@ docker_versioned_pkg: '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 }} - 'stable': docker-ce=17.03.0~ce-0~debian-{{ ansible_distribution_release|lower }} - 'edge': docker-ce=17.03.0~ce-0~debian-{{ ansible_distribution_release|lower }} + 'stable': docker-engine=17.03.0~ce-0~debian-{{ ansible_distribution_release|lower }} + 'edge': docker-engine=17.03.0~ce-0~debian-{{ ansible_distribution_release|lower }} docker_package_info: pkg_mgr: apt diff --git a/roles/docker/vars/ubuntu.yml b/roles/docker/vars/ubuntu.yml index 731418347..1fd7efd68 100644 --- a/roles/docker/vars/ubuntu.yml +++ b/roles/docker/vars/ubuntu.yml @@ -7,8 +7,8 @@ docker_versioned_pkg: '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 }} - 'stable': docker-ce=17.03.0~ce-0~ubuntu-{{ ansible_distribution_release|lower }} - 'edge': docker-ce=17.03.0~ce-0~ubuntu-{{ ansible_distribution_release|lower }} + 'stable': docker-engine=17.03.0~ce-0~ubuntu-{{ ansible_distribution_release|lower }} + 'edge': docker-engine=17.03.0~ce-0~ubuntu-{{ ansible_distribution_release|lower }} docker_package_info: pkg_mgr: apt