docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Assume that if VAGRANT_DEFAULT_PROVIDER is set we shouldn't install vbox tools

This commit is contained in:
Sean P. Kane 2013-08-07 09:38:49 -07:00
parent 2409df9285
commit 0e21de9a25
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Vagrantfile vendored
View File

@ -25,7 +25,8 @@ Vagrant::Config.run do |config|
"apt-get update -qq; apt-get install -q -y linux-image-3.8.0-19-generic; " "apt-get update -qq; apt-get install -q -y linux-image-3.8.0-19-generic; "
# Add guest additions if local vbox VM # Add guest additions if local vbox VM
is_vbox = true is_vbox = true
ARGV.each do |arg| is_vbox &&= !arg.downcase.start_with?("--provider") end # The logic here makes a few assumptions (i.e. no one uses --provider=virtualbox)
ARGV.each do |arg| is_vbox &&= ( !arg.downcase.start_with?("--provider") && !ENV['VAGRANT_DEFAULT_PROVIDER'] )end
if is_vbox if is_vbox
pkg_cmd << "apt-get install -q -y linux-headers-3.8.0-19-generic dkms; " \ pkg_cmd << "apt-get install -q -y linux-headers-3.8.0-19-generic dkms; " \
"echo 'Downloading VBox Guest Additions...'; " \ "echo 'Downloading VBox Guest Additions...'; " \