From 47160b8845d02800456725113c26db09331e7e0d Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Mon, 16 Nov 2015 15:11:35 -0500 Subject: [PATCH 1/3] Remove /cygdrive prefix `/cygdrive` prefix was needed for docker-compose installed via pip. The native binary does not expect this prefix. --- Vagrantfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 32d18a5..f5e130f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -18,7 +18,8 @@ is_windows = Vagrant::Util::Platform.windows? # Determine paths. vagrant_root = File.dirname(__FILE__) # Vagrantfile location if is_windows - vagrant_mount_point = `cygpath #{vagrant_root}`.strip! # Remove trailing \n + vagrant_mount_point = `cygpath #{vagrant_root}`.strip! # Remove trailing \n + vagrant_mount_point = vagrant_mount_point.gsub(/\/cygdrive/, '') # Remove '/cygdrive' prefix else vagrant_mount_point = vagrant_root end From 30a56254eb7de2a59b50473ecdd39a14441c4c34 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Mon, 16 Nov 2015 16:06:52 -0500 Subject: [PATCH 2/3] Minor message text change for rsync-auto --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index f5e130f..68a8125 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -202,7 +202,7 @@ Vagrant.configure("2") do |config| [:up, :reload, :resume].each do |trigger| config.trigger.after trigger do success "Starting background rsync-auto process..." - info "Run 'tail -f #{vagrant_root}/rsync.log' to see logs." + info "Run 'tail -f #{vagrant_root}/rsync.log' to see rsync-auto logs." # Kill the old sync process `kill $(pgrep -f rsync-auto) > /dev/null 2>&1 || true` # Start a new sync process in background From 6b2bd7d64dfd5939c20334bd21b008b3583a88df Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Mon, 16 Nov 2015 16:08:50 -0500 Subject: [PATCH 3/3] Give all permissions on files (777) on the smb mount Allows any script files to be executed --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 68a8125..149ed17 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -164,7 +164,7 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", run: "always" do |s| s.inline = <<-SCRIPT mkdir -p vagrant $2 - mount -t cifs -o uid=`id -u docker`,gid=`id -g docker`,sec=ntlm,username=$3,pass=$4,dir_mode=0777,file_mode=0666 //$5/$1 $2 + mount -t cifs -o uid=`id -u docker`,gid=`id -g docker`,sec=ntlm,username=$3,pass=$4,dir_mode=0777,file_mode=0777 //$5/$1 $2 SCRIPT s.args = "#{vagrant_folder_name} #{vagrant_mount_point} #{$vconfig['synced_folders']['smb_username']} #{$vconfig['synced_folders']['smb_password']} #{host_ip}" end