Merge pull request #86 from blinkreaction/develop

Release v1.7.0

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.7.0 (2016-08-26)
+
+- IMPORTANT: this release requires VirtualBox v5.1.x and Vagrant v1.8.5+
+- Version updates
+  - blinkreaction/boot2docker base box v1.12.1
+  - docker cli 1.12.1
+  - docker-compose 1.8.0
+  - winpty 0.4.0 (Windows only)
+
 ## 1.6.2 (2016-06-27)
 
 - Hotfix: Fixed broken winpty dependency since 1.6.0 on Windows

README.md

@@ -11,9 +11,9 @@ The stock boot2docker/docker-machine mounts host volumes via VirtualBox Guest Ad
 
 <a name="requirements"></a>
 ## Prerequisites
-1. [VirtualBox](https://www.virtualbox.org/) 5.0+
-2. [Vagrant](https://www.vagrantup.com/) 1.7.3+
-3. [Babun](http://babun.github.io) - A Linux-type shell, **Windows only**
+1. [VirtualBox](https://www.virtualbox.org/) 5.1.x
+2. [Vagrant](https://www.vagrantup.com/) 1.8.5+
+3. [Babun](http://babun.github.io) - A Linux-type shell + [winpty](https://github.com/rprichard/winpty), **Windows only**
 
 For best result and a clean setup it is recommended to remove any previous versions of VirtualBox, Vagrant, boot2docker, docker and docker-compose.
 
@@ -50,6 +50,8 @@ Designate a root folder that the VM will have access to (e.g. `~/Projects`) and
 
 ### Manual installation
 
+Use these steps if you have VirtualBox and/or Vagrant already installed or prefer/need to install them manually.
+
 1. Copy `Vagrantfile` and `vagrant.yml` into a designated folder
 2. Inside the folder run
 

VERSION

@@ -1 +1 @@
-1.6.2
+1.7.0

Vagrantfile

@@ -93,13 +93,13 @@ end
 ######################################################################
 
 # Vagrant Box Configuration #
-Vagrant.require_version ">= 1.7.3"
+Vagrant.require_version ">= 1.8.5"
 
 Vagrant.configure("2") do |config|
   config.vm.define "boot2docker"
 
   config.vm.box = "blinkreaction/boot2docker"
-  config.vm.box_version = "1.11.2"
+  config.vm.box_version = "1.12.1"
   config.vm.box_check_update = true
 
   ## Network ##

scripts/presetup-mac.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-DOCKER_VERSION=1.11.2
-DOCKER_COMPOSE_VERSION=1.7.1
+DOCKER_VERSION=1.12.1
+DOCKER_COMPOSE_VERSION=1.8.0
 
 # Console colors
 red='\033[0;31m'

scripts/presetup-win.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-DOCKER_VERSION=1.11.2
-DOCKER_COMPOSE_VERSION=1.7.1
+DOCKER_VERSION=1.12.1
+DOCKER_COMPOSE_VERSION=1.8.0
 # These two shouldbe changes together. Always check https://github.com/rprichard/winpty/releases for the current version.
-WINPTY_VERSION=0.3.1
-CYGWIN_VERSION=2.5.1
+WINPTY_VERSION=0.4.0
+CYGWIN_VERSION=2.5.2
 ##
 
 # Console colors