From 3fef552978e04feede58813e4dbe8a8a24483698 Mon Sep 17 00:00:00 2001
From: Antoine Legrand <antoine.legrand@arkena.com>
Date: Sat, 13 Feb 2016 06:19:47 +0100
Subject: [PATCH] Docker 1.10.1
---
roles/docker/defaults/main.yml | 2 +-
roles/docker/vars/debian.yml | 2 +-
roles/docker/vars/fedora.yml | 1 +
roles/docker/vars/ubuntu.yml | 2 ++
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 3caecf3af..685bc57cd 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -1 +1 @@
-docker_version: 1.9
+docker_version: 1.10
diff --git a/roles/docker/vars/debian.yml b/roles/docker/vars/debian.yml
index aed7121f2..9a116a636 100644
--- a/roles/docker/vars/debian.yml
+++ b/roles/docker/vars/debian.yml
@@ -4,7 +4,7 @@ docker_kernel_min_version: '3.2'
docker_versioned_pkg:
latest: docker-engine
1.9: docker-engine=1.9.1-0~{{ ansible_distribution_release|lower }}
- 1.10: docker-engine=1.10.0-0~{{ ansible_distribution_release|lower }}
+ 1.10: docker-engine=1.10.1-0~{{ 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 aae1c024d..a27492234 100644
--- a/roles/docker/vars/fedora.yml
+++ b/roles/docker/vars/fedora.yml
@@ -3,6 +3,7 @@ docker_kernel_min_version: '0'
docker_versioned_pkg:
latest: docker
1.9: docker-1:1.9.1
+ 1.10: docker-1:1.10.1
docker_package_info:
pkg_mgr: dnf
diff --git a/roles/docker/vars/ubuntu.yml b/roles/docker/vars/ubuntu.yml
index 853b2798b..98eef3960 100644
--- a/roles/docker/vars/ubuntu.yml
+++ b/roles/docker/vars/ubuntu.yml
@@ -1,9 +1,11 @@
+
docker_kernel_min_version: '3.2'
# https://apt.dockerproject.org/repo/dists/ubuntu-trusty/main/filelist
docker_versioned_pkg:
latest: docker-engine
1.9: docker-engine=1.9.0-0~{{ ansible_distribution_release|lower }}
+ 1.10: docker-engine=1.10.1-0~{{ ansible_distribution_release|lower }}
docker_package_info:
pkg_mgr: apt
--
GitLab