Merge pull request #75 from blinkreaction/develop

Release v1.5.1

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+
+## 1.5.1 (2016-04-18)
+
+- Windows fixes
+  - Use a more complex smb_password
+    - This addresses issues in strict password enforcement environments.
+    - IMPORTANT (Only if you are using the `default` or `smb2` sharing type on Windows - check in `vagrant.yml`):
+      - In an **admin cmd.exe** prompt run `net user vagrant P@ssW0rd1!` to update the existing vagrant user password.
+      - Alternatively start fresh: `vagrant destroy -f`, then `vagrant up`
+  - Improved winpty compatibility
+    - IMPORTANT: Prior to updating run `rm -f /usr/local/bin/docker*` in Babun, then run the install script.
+- Silence docker run shell provisioning
+  - No more red text output from `docker run` during the first VM boot
+- Updated VERSION file
+
+
 ## 1.5.0 (2016-04-14)
 
 - Switched to blinkreaction/boot2docker base box [v1.10.3](https://atlas.hashicorp.com/blinkreaction/boxes/boot2docker/versions/1.10.3)

VERSION

@@ -1 +1 @@
-1.4.0
+1.5.1

Vagrantfile

@@ -312,7 +312,7 @@ Vagrant.configure("2") do |config|
       docker run -d --name dns --label "group=system" \
       -p $1:53:53/udp -p 172.17.42.1:53:53/udp --cap-add=NET_ADMIN --dns 10.0.2.3 \
       -v /var/run/docker.sock:/var/run/docker.sock \
-      blinkreaction/dns-discovery@sha256:f1322ab6d5496c8587e59e47b0a8b1479a444098b40ddd598e85e9ab4ce146d8 > /dev/null
+      blinkreaction/dns-discovery@sha256:f1322ab6d5496c8587e59e47b0a8b1479a444098b40ddd598e85e9ab4ce146d8 > /dev/null 2>&1
     SCRIPT
     s.args = "#{box_ip}"
   end
@@ -327,7 +327,7 @@ Vagrant.configure("2") do |config|
         docker rm -f vhost-proxy > /dev/null 2>&1 || true
         docker run -d --name vhost-proxy --label "group=system" -p $1:80:80 -p $1:443:443 \
         -v /var/run/docker.sock:/tmp/docker.sock \
-        blinkreaction/nginx-proxy@sha256:1707c0fd2fa4f0e98a656f748a4edb8a04578e9dc63115acc23a05225f151e04 > /dev/null
+        blinkreaction/nginx-proxy@sha256:1707c0fd2fa4f0e98a656f748a4edb8a04578e9dc63115acc23a05225f151e04 > /dev/null 2>&1
       SCRIPT
       s.args = "#{box_ip}"
     end

scripts/presetup-win.sh

@@ -30,19 +30,19 @@ cscript $WINDIR/Temp/presetup-win.vbs
 
 # Install Docker
 echo-green "Installing docker cli v${DOCKER_VERSION}..."
-curl -sSL https://get.docker.com/builds/Windows/i386/docker-$DOCKER_VERSION.exe -o /usr/local/bin/docker
-chmod +x /usr/local/bin/docker
+curl -sSL https://get.docker.com/builds/Windows/i386/docker-$DOCKER_VERSION.exe -o /usr/local/bin/docker.exe
+chmod +x /usr/local/bin/docker.exe
 
 # Install Docker Compose
 echo-green "Installing docker-compose v${DOCKER_COMPOSE_VERSION}..."
-curl -sSL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Windows-x86_64.exe > /usr/local/bin/docker-compose
-chmod +x /usr/local/bin/docker-compose
+curl -sSL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Windows-x86_64.exe -o /usr/local/bin/docker-compose.exe
+chmod +x /usr/local/bin/docker-compose.exe
 
 # Install winpty
 echo-green "Installing winpty (console) v$WINPTY_VERSION..."
 curl -sSL -O https://github.com/rprichard/winpty/releases/download/$WINPTY_VERSION/winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32.tar.gz
 tar -xf winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32.tar.gz
-mv winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32/bin/* /usr/bin
+mv winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32/bin/* /usr/local/bin
 rm -rf winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32*
 
 # Git settings

vagrant.yml

@@ -16,7 +16,7 @@ synced_folders:
   # This is usually your Windows username and password, unless you created a dedicated user for vagrant.
   # If using the 'smb2' type above the user and share will be configured automatically.
   smb_username: 'vagrant'
-  smb_password: 'vagrant'
+  smb_password: 'P@ssW0rd1!'
   # Create smb share on vagrant up (if type smb2). Set to false if you want to or already created the user and the smb share manually.
   # If false, the share name should be equal to the directory name in which Vagrantfile is located.
   smb2_auto: true