haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not fail if uninstalling lxc/docker-io fails

This commit is contained in:
Seth Vargo 2015-11-19 18:34:31 -08:00
parent bad4c2103d
commit 1b08cfcd09
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/provisioners/docker/cap/debian/docker_install.rb
View File

@ -7,7 +7,7 @@ module VagrantPlugins
machine.communicate.tap do |comm|
comm.sudo("apt-get update -qq -y")
comm.sudo("apt-get install -qq -y --force-yes curl")
comm.sudo("apt-get purge -qq -y lxc-docker*")
comm.sudo("apt-get purge -qq -y lxc-docker* || true")
comm.sudo("curl -sSL https://get.docker.com/ | sh")
end
end

2
plugins/provisioners/docker/cap/redhat/docker_install.rb
View File

@ -6,7 +6,7 @@ module VagrantPlugins
def self.docker_install(machine)
machine.communicate.tap do |comm|
comm.sudo("yum -q -y update")
comm.sudo("yum -q -y remove docker-io*")
comm.sudo("yum -q -y remove docker-io* || true")
comm.sudo("curl -sSL https://get.docker.com/ | sh")
end