Merge pull request #79 from blinkreaction/develop

Release v1.6.0

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.6.0 (2016-06-03)
+
+- Switched to blinkreaction/boot2docker base box [v1.11.2](https://atlas.hashicorp.com/blinkreaction/boxes/boot2docker/versions/1.11.2)
+  - boot2docker/docker 1.11.2, docker-compose 1.7.1
+- Set `v.memory: 1024` by default
+- System services
+  - New ssh-agent service
+  - Use the `stable` tag for vhost-proxy, dns, ssh-agent
+  - Bind all system services to `0.0.0.0`
+  - Run services with `--privileged --userns=host` (to give propper access to `docker.sock`)
+- Remove `scripts/presetup-ubuntu.sh`
+- Misc. imporvements in `presetup-mac.sh` and `presetup-win.sh`
+
 
 ## 1.5.1 (2016-04-18)
 

VERSION

@@ -1 +1 @@
-1.5.1
+1.6.0

Vagrantfile

@@ -99,7 +99,7 @@ Vagrant.configure("2") do |config|
   config.vm.define "boot2docker"
 
   config.vm.box = "blinkreaction/boot2docker"
-  config.vm.box_version = "1.10.3"
+  config.vm.box_version = "1.11.2"
   config.vm.box_check_update = true
 
   ## Network ##
@@ -304,32 +304,37 @@ Vagrant.configure("2") do |config|
   end
 
   # System-wide dnsmasq service for DNS discovery and name resolution
-  # Image: blinkreaction/dns-discovery v1.0.0
-  config.vm.provision "shell", run: "always", privileged: false do |s|
+  config.vm.provision "shell", privileged: false do |s|
     s.inline = <<-SCRIPT
-      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 10.0.2.3 \
+      echo "Setting up system-wide DNS service... "
+      docker run -d --name dns --label "group=system" --restart=always --privileged --userns=host \
+      -p 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 2>&1
+      blinkreaction/dns-discovery:stable > /dev/null 2>&1
+    SCRIPT
+  end
+
+  # System-wide ssh-agent service.
+  config.vm.provision "shell", privileged: false do |s|
+    s.inline = <<-SCRIPT
+      echo "Setting up system-wide ssh-agent service..."
+      docker run -d --name ssh-agent --label "group=system" --restart=always --privileged --userns=host \
+      -v /var/run/docker.sock:/var/run/docker.sock \
+      blinkreaction/ssh-agent:stable > /dev/null 2>&1
     SCRIPT
-    s.args = "#{box_ip}"
   end
 
   # System-wide vhost-proxy service.
   # Containers must define a "VIRTUAL_HOST" environment variable to be recognized and routed by the vhost-proxy.
-  # Image: blinkreaction/nginx-proxy v1.1.0
   if $vconfig['vhost_proxy']
-    config.vm.provision "shell", run: "always", privileged: false do |s|
+    config.vm.provision "shell", privileged: false do |s|
       s.inline = <<-SCRIPT
-        echo "Starting system-wide HTTP/HTTPS reverse proxy on $1... "
-        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 \
+        echo "Setting up system-wide HTTP/HTTPS reverse proxy... "
+        docker run -d --name vhost-proxy --label "group=system" --restart=always --privileged --userns=host \
+        -p 80:80 -p 443:443 \
         -v /var/run/docker.sock:/tmp/docker.sock \
-        blinkreaction/nginx-proxy@sha256:1707c0fd2fa4f0e98a656f748a4edb8a04578e9dc63115acc23a05225f151e04 > /dev/null 2>&1
+        blinkreaction/nginx-proxy:stable > /dev/null 2>&1
       SCRIPT
-      s.args = "#{box_ip}"
     end
   end
 

scripts/presetup-mac.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-DOCKER_VERSION=1.10.3
-DOCKER_COMPOSE_VERSION=1.6.2
+DOCKER_VERSION=1.11.2
+DOCKER_COMPOSE_VERSION=1.7.1
 
 # Console colors
 red='\033[0;31m'
@@ -32,11 +32,15 @@ VBoxManage hostonlyif remove vboxnet0 > /dev/null 2>&1
 echo-green "Installing vagrant..."
 brew cask install vagrant
 
+# Remove old docker version
+sudo rm -f /usr/local/bin/docker >/dev/null 2>&1 || true
 # Install docker
 echo-green "Installing docker cli v${DOCKER_VERSION}..."
 sudo curl -sSL "https://get.docker.com/builds/$(uname -s)/$(uname -m)/docker-$DOCKER_VERSION" -o /usr/local/bin/docker
 sudo chmod +x /usr/local/bin/docker
 
+# Remove old docker-compose version
+sudo rm -f /usr/local/bin/docker-compose >/dev/null 2>&1 || true
 # Install docker-compose
 echo-green "Installing docker-compose v${DOCKER_COMPOSE_VERSION}..."
 sudo curl -sSL "https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose

scripts/presetup-win.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-DOCKER_VERSION=1.10.3
-DOCKER_COMPOSE_VERSION=1.6.2
-WINPTY_VERSION=0.2.2
+DOCKER_VERSION=1.11.2
+DOCKER_COMPOSE_VERSION=1.7.1
+WINPTY_VERSION=0.3.1
 
 # Console colors
 red='\033[0;31m'
@@ -28,11 +28,15 @@ curl -sSL https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/${
 echo-yellow "Setup needs administrator privileges to contiue..."
 cscript $WINDIR/Temp/presetup-win.vbs
 
+# Remove old docker version
+rm -f /usr/local/bin/docker >/dev/null 2>&1 || true
 # 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.exe
 chmod +x /usr/local/bin/docker.exe
 
+# Remove old docker-compose version
+rm -f /usr/local/bin/docker-compose >/dev/null 2>&1 || true
 # 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 -o /usr/local/bin/docker-compose.exe

vagrant.yml

@@ -50,7 +50,7 @@ synced_folders:
 
 # VirtualBox VM settings
 v.gui: false  # Set to true for debugging. Will unhide VM's primary console screen.
-v.memory: 2048  # Memory settings.
+v.memory: 1024  # Memory settings.
 v.cpus: 1  # CPU settings. VirtualBox works much better with a single CPU.
 
 # Network settings