From 07cd81ef58d5928d53efd9b32b811cbded8bda94 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Fri, 16 Dec 2016 16:30:46 +0300
Subject: [PATCH] Update docker to 1.12.5

Note the new ubuntu/debian version string change:
https://github.com/docker/docker/issues/29355
---
 roles/docker/vars/debian.yml       | 2 +-
 roles/docker/vars/fedora.yml       | 2 +-
 roles/docker/vars/ubuntu-16.04.yml | 2 +-
 roles/docker/vars/ubuntu.yml       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/docker/vars/debian.yml b/roles/docker/vars/debian.yml
index 964f59431..f9bca1a22 100644
--- a/roles/docker/vars/debian.yml
+++ b/roles/docker/vars/debian.yml
@@ -6,7 +6,7 @@ docker_versioned_pkg:
   '1.9': docker-engine=1.9.1-0~{{ ansible_distribution_release|lower }}
   '1.10': docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }}
   '1.11': docker-engine=1.11.2-0~{{ ansible_distribution_release|lower }}
-  '1.12': docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }}
+  '1.12': docker-engine=1.12.5-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 1ed1a1338..9fef0d37f 100644
--- a/roles/docker/vars/fedora.yml
+++ b/roles/docker/vars/fedora.yml
@@ -5,7 +5,7 @@ docker_versioned_pkg:
   '1.9': docker-1:1.9.1
   '1.10': docker-1:1.10.1
   '1.11': docker-1:1.11.2
-  '1.12': docker-1:1.12.1
+  '1.12': docker-1:1.12.5
 
 docker_package_info:
   pkg_mgr: dnf
diff --git a/roles/docker/vars/ubuntu-16.04.yml b/roles/docker/vars/ubuntu-16.04.yml
index b59bbd81c..21fb1927a 100644
--- a/roles/docker/vars/ubuntu-16.04.yml
+++ b/roles/docker/vars/ubuntu-16.04.yml
@@ -6,7 +6,7 @@ docker_kernel_min_version: '3.2'
 docker_versioned_pkg:
   'latest': docker-engine
   '1.11': docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }}
-  '1.12': docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }}
+  '1.12': docker-engine=1.12.5-0~ubuntu-{{ 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 2e73d8c2d..2b258670a 100644
--- a/roles/docker/vars/ubuntu.yml
+++ b/roles/docker/vars/ubuntu.yml
@@ -7,7 +7,7 @@ docker_versioned_pkg:
   '1.9': docker-engine=1.9.0-0~{{ ansible_distribution_release|lower }}
   '1.10': docker-engine=1.10.3-0~{{ ansible_distribution_release|lower }}
   '1.11': docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }}
-  '1.12': docker-engine=1.12.1-0~{{ ansible_distribution_release|lower }}
+  '1.12': docker-engine=1.12.5-0~ubuntu-{{ ansible_distribution_release|lower }}
 
 docker_package_info:
   pkg_mgr: apt