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

Merge pull request #6489 from invernizzi/master 

Update docker installer to work on custom kernels
This commit is contained in:
Mitchell Hashimoto 2015-11-18 15:16:32 -08:00
parent a6f56b1592 df32f6ac51
commit 394f66468d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,9 @@ module VagrantPlugins
comm.sudo("apt-get update -y") comm.sudo("apt-get update -y")
# TODO: Perform check on the host machine if aufs is installed and using LXC # TODO: Perform check on the host machine if aufs is installed and using LXC
if machine.provider_name != :lxc if machine.provider_name != :lxc
comm.sudo("lsmod | grep aufs || modprobe aufs || apt-get install -y linux-image-extra-`uname -r`") # Attempt to install linux-image-extra for this kernel, if it exists
package_name = "linux-image-extra-`uname -r`"
comm.sudo("lsmod | grep aufs || modprobe aufs || apt-cache show #{package_name} && apt-get install -y #{package_name} || true")
end end
comm.sudo("apt-get install -y --force-yes -q curl") comm.sudo("apt-get install -y --force-yes -q curl")
comm.sudo("curl -sSL https://get.docker.com/gpg | apt-key add -") comm.sudo("curl -sSL https://get.docker.com/gpg | apt-key add -")