Merge pull request mitchellh#37 from ffung/master

address issue mitchellh#36
legal90 · Sep 12, 2015 · aa3fe45 · aa3fe45
2 parents b3cc50c + f2ec63a
commit aa3fe45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -54,10 +54,12 @@ Next, you need to configure your Docker environment :
 # For VirtualBox provider:
 export DOCKER_CERT_PATH=`pwd`/tls
 export DOCKER_HOST=tcp://192.168.10.10:2376
+export DOCKER_TLS_VERIFY=1
 
 # For Parallels provider:
 export DOCKER_CERT_PATH=`pwd`/tls
 export DOCKER_HOST="tcp://`vagrant ssh-config | sed -n "s/[ ]*HostName[ ]*//gp"`:2376"
+export DOCKER_TLS_VERIFY=1
 ```
 
 ## Building the Box

diff --git a/vagrantfile.tpl b/vagrantfile.tpl
@@ -1,5 +1,5 @@
 Vagrant.configure("2") do |config|
-  CURRENT_DIR = File.expand_path(File.dirname(__FILE__))
+  CURRENT_DIR = Dir.pwd
 
   config.ssh.shell = "sh"
   config.ssh.username = "docker"
@@ -23,6 +23,8 @@ Vagrant.configure("2") do |config|
     override.vm.network "private_network", ip: "192.168.10.10", id: "default-network", nic_type: "virtio"
   end
 
+  config.vm.provision "shell", inline: "[ ! -d /vagrant ] && ln -s #{CURRENT_DIR} /vagrant || true"
+
   # Add bootlocal support
   if File.file?('./bootlocal.sh')
     config.vm.provision "shell", path: "bootlocal.sh", run: "always"