Merge pull request #748 from achanda/docker_version

Update docker before testing

.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:

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