From 3f4a375ac44e506c1052a1b2d031ad773b428c09 Mon Sep 17 00:00:00 2001
From: David Crook <idcrook@users.noreply.github.com>
Date: Thu, 2 Mar 2017 13:48:09 -0700
Subject: [PATCH] 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
--
GitLab