From 0eb223734b5bf4f36fa862bead335a642556c650 Mon Sep 17 00:00:00 2001 From: Matt Palmer Date: Mon, 14 Sep 2015 15:32:51 +1000 Subject: [PATCH] Automatically install Docker in the recommended fashion This should be enough to ensure that, if this install method were to become unavailable in the future, we'd know about it and could alter our other documentation. --- Vagrantfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 42a0655..106b625 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,5 +1,5 @@ Vagrant.configure(2) do |config| - config.vm.define :ubuntu do |config| + config.vm.define :dockerhost do |config| config.vm.box = "trusty64" config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" @@ -15,13 +15,14 @@ Vagrant.configure(2) do |config| apt-get update apt-get -y remove --purge puppet juju apt-get -y autoremove --purge + wget -qO- https://get.docker.com/ | sh EOF - end - if ENV["http_proxy"] - config.vm.provision "shell", inline: <<-EOF - echo "Acquire::http::Proxy \\"#{ENV['http_proxy']}\\";" >/etc/apt/apt.conf.d/50proxy - echo "http_proxy=\"#{ENV['http_proxy']}\"" >/etc/profile.d/http_proxy.sh - EOF + if ENV["http_proxy"] + config.vm.provision "shell", inline: <<-EOF + echo "Acquire::http::Proxy \\"#{ENV['http_proxy']}\\";" >/etc/apt/apt.conf.d/50proxy + echo "http_proxy=\"#{ENV['http_proxy']}\"" >/etc/profile.d/http_proxy.sh + EOF + end end end -- 2.25.1