From 20cd8a0a30bd0e8696dcc467b91d27df7ee80b2c Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 6 Dec 2015 22:24:29 +0100 Subject: [PATCH 1/2] feat(docker-update): updated docker repo --- scripts/docker.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/docker.sh b/scripts/docker.sh index 2a51764b..c4df4ac2 100644 --- a/scripts/docker.sh +++ b/scripts/docker.sh @@ -3,15 +3,17 @@ echo ">>> Installing Docker" # Add Key -sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 +apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D + # Add Repository -sudo sh -c "echo deb https://get.docker.com/ubuntu docker main > /etc/apt/sources.list.d/docker.list" +echo "deb deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list sudo apt-get update # Install Docker # -qq implies -y --force-yes -sudo apt-get install -qq lxc-docker +apt-get install -qq linux-image-extra-$(uname -r) +sudo apt-get install -qq docker-engine # Make the vagrant user able to interact with docker without sudo if [ ! -z "$1" ]; then From fd81302dda4ca4635ca4c8fcb301b4650bafcc75 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 6 Dec 2015 22:33:27 +0100 Subject: [PATCH 2/2] fix(docker-update): fixed typo --- scripts/docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker.sh b/scripts/docker.sh index c4df4ac2..804f39b3 100644 --- a/scripts/docker.sh +++ b/scripts/docker.sh @@ -7,7 +7,7 @@ apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E8 # Add Repository -echo "deb deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list sudo apt-get update # Install Docker