From bbf7646751329178dcdaf5100380ea2b59614470 Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Mon, 14 Sep 2015 15:08:25 +0100
Subject: [PATCH] Update docker repo, keys and package name

---
 Vagrantfile       | 2 +-
 test/Vagrantfile  | 6 +++---
 vagrant-common.rb | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 55e3b54d..28f742f9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,7 +5,7 @@ require './vagrant-common.rb'
 vm_ip = "172.16.0.3" # arbitrary private IP
 
 pkgs = %w(
-  lxc-docker
+  docker-engine
   aufs-tools
   build-essential
   ethtool
diff --git a/test/Vagrantfile b/test/Vagrantfile
index 750f4c7f..1080bfdd 100644
--- a/test/Vagrantfile
+++ b/test/Vagrantfile
@@ -12,7 +12,7 @@ ip_suffix_base = 10
 require '../vagrant-common.rb'
 
 def configure_docker(host, hostname, ip)
-  pkgs = %w(lxc-docker ethtool)
+  pkgs = %w(docker-engine ethtool)
 
   host.vm.box = "ubuntu/ubuntu-15.04-amd64"
   host.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/vivid/current/vivid-server-cloudimg-amd64-vagrant-disk1.box"
@@ -22,8 +22,8 @@ def configure_docker(host, hostname, ip)
 
   host.vm.synced_folder ".", "/vagrant", disabled: true
 
-  host.vm.provision :shell, :inline => "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9"
-  host.vm.provision :shell, :inline => "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list"
+  host.vm.provision :shell, :inline => "sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"
+  host.vm.provision :shell, :inline => "echo deb https://apt.dockerproject.org/repo ubuntu-vivid main > /etc/apt/sources.list.d/docker.list"
 
   install_packages host.vm, pkgs
   tweak_docker_daemon host.vm
diff --git a/vagrant-common.rb b/vagrant-common.rb
index 8b5557a1..2662565e 100644
--- a/vagrant-common.rb
+++ b/vagrant-common.rb
@@ -13,9 +13,9 @@ def install_build_deps(vm, pkgs)
   vm.provision :shell, :inline => <<SCRIPT
 export DEBIAN_FRONTEND=noninteractive
 apt-key adv \
-  --keyserver hkp://keyserver.ubuntu.com:80 \
-  --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
-echo 'deb https://get.docker.io/ubuntu docker main' \
+  --keyserver hkp://p80.pool.sks-keyservers.net:80 \
+  --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+echo 'deb https://apt.dockerproject.org/repo ubuntu-vivid main' \
   > /etc/apt/sources.list.d/docker.list
 SCRIPT
   install_packages(vm, pkgs)