From 12a635a5e6ab0e0a84e723bacadb56af726819c7 Mon Sep 17 00:00:00 2001
From: Abhishek Chanda <abhishek.chanda@emc.com>
Date: Wed, 3 Feb 2016 00:47:11 -0800
Subject: [PATCH] Update docker before testing

Lifted from https://github.com/fsouza/go-dockerclient
---
 .travis.yml | 3 ++-
 Makefile    | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c9fe2a85c..ee85997c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ go:
   - tip
 
 env:
-  - TRAVIS_RUN=true
+  - TRAVIS_RUN=true DOCKER_VERSION=1.9.1
 
 matrix:
   allow_failures:
@@ -22,6 +22,7 @@ branches:
     - master
 
 install:
+  - make prepare_docker
   - make bootstrap
 
 script:
diff --git a/Makefile b/Makefile
index 6fd8b92f7..ca6e4910b 100644
--- a/Makefile
+++ b/Makefile
@@ -71,4 +71,13 @@ bootstrap:
     go get $$tool; \
 	done
 
+prepare_docker:
+	sudo stop docker
+	sudo rm -rf /var/lib/docker
+	sudo rm -f `which docker`
+	sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+	echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list
+	sudo apt-get update
+	sudo apt-get install docker-engine=$(DOCKER_VERSION)-0~$(shell lsb_release -cs) -y --force-yes
+
 .PHONY: all bin cov deps integ test vet web web-push test-nodep