Merge pull request #74 from blinkreaction/develop

Release v1.5.0
lmakarov · Apr 14, 2016 · a3b874d · a3b874d
2 parents 8b8c8c1 + 4364c18
commit a3b874d
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 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)
+  - boot2docker/docker 1.10.3, docker-compose 1.6.2
+- Using `upgrade` command with choco on Windows
+- Added winpty on Windows
+  - This allows running interactive docker commands in Babun directly (without using `vagrant ssh -c`)
+- Using VirtualBox DNS proxy with the DNS Discovery service
+
+
 ## 1.4.0 (2016-01-20)
 
 - Version updates

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # Boot2docker Vagrant Box
+
 Boot2docker Vagrant box for optimized Docker and Docker Compose use on Mac and Windows.
 
 

diff --git a/Vagrantfile b/Vagrantfile
@@ -99,7 +99,7 @@ Vagrant.configure("2") do |config|
   config.vm.define "boot2docker"
 
   config.vm.box = "blinkreaction/boot2docker"
-  config.vm.box_version = "1.9.1"
+  config.vm.box_version = "1.10.3"
   config.vm.box_check_update = true
 
   ## Network ##
@@ -262,10 +262,12 @@ Vagrant.configure("2") do |config|
     v.cpus = $vconfig['v.cpus']  # CPU settings. VirtualBox works much better with a single CPU.
     v.memory = $vconfig['v.memory']  # Memory settings.
 
-    # Disable VirtualBox DNS proxy as it may cause issues.
-    # See https://github.com/docker/machine/pull/1069
+    # Use VirtualBox DNS proxy mode (but not the resolver mode).
+    # See https://www.virtualbox.org/manual/ch09.html#nat-adv-dns
+    # and https://www.virtualbox.org/manual/ch09.html#nat_host_resolver_proxy
+    # Also see https://github.com/docker/machine/pull/1069 for a different perspective on this.
+    v.customize ['modifyvm', :id, '--natdnsproxy1', 'on']
     v.customize ['modifyvm', :id, '--natdnshostresolver1', 'off']
-    v.customize ['modifyvm', :id, '--natdnsproxy1', 'off']
   end
 
   ## Provisioning scripts ##
@@ -308,7 +310,7 @@ Vagrant.configure("2") do |config|
       echo "Starting system-wide DNS service... "
       docker rm -f dns > /dev/null 2>&1 || true
       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 8.8.8.8 \
+      -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
     SCRIPT

diff --git a/scripts/presetup-mac.sh b/scripts/presetup-mac.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-DOCKER_VERSION=1.9.1
-DOCKER_COMPOSE_VERSION=1.5.2
+DOCKER_VERSION=1.10.3
+DOCKER_COMPOSE_VERSION=1.6.2
 
 # Console colors
 red='\033[0;31m'

diff --git a/scripts/presetup-win.cmd b/scripts/presetup-win.cmd
@@ -2,11 +2,11 @@ REM Installing Chocolatey
 @powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
 
 REM Installing virtualbox
-choco install virtualbox -y
+choco upgrade virtualbox -y
 
 REM Killing the default adapter and DHCP server to avoid network issues down the road
 "C:\Program Files\Oracle\VirtualBox\VBoxManage" dhcpserver remove --netname "HostInterfaceNetworking-VirtualBox Host-Only Ethernet Adapter"
 "C:\Program Files\Oracle\VirtualBox\VBoxManage" hostonlyif remove "VirtualBox Host-Only Ethernet Adapter"
 
 REM Installing vagrant
-choco install vagrant -y
+choco upgrade vagrant -y
diff --git a/scripts/presetup-win.sh b/scripts/presetup-win.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-DOCKER_VERSION=1.9.1
-DOCKER_COMPOSE_VERSION=1.5.2
+DOCKER_VERSION=1.10.3
+DOCKER_COMPOSE_VERSION=1.6.2
+WINPTY_VERSION=0.2.2
 
 # Console colors
 red='\033[0;31m'
@@ -37,6 +38,13 @@ 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
 
+# 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
+rm -rf winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32*
+
 # Git settings
 echo-green "Adjusting git defaults..."
 git config --global core.autocrlf input
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,5 @@
		# Boot2docker Vagrant Box

		Boot2docker Vagrant box for optimized Docker and Docker Compose use on Mac and Windows.


Expand Down