From 335436bf7eadccc98b1dc1c9ee95ea72516bb073 Mon Sep 17 00:00:00 2001
From: Mathieu Fosse <mathieu.fosse@gmail.com>
Date: Tue, 26 Jan 2016 17:30:35 +0100
Subject: [PATCH 1/5] Use docker 1.10 tools

---
 install.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/install.sh b/install.sh
index 1021374..a85238f 100755
--- a/install.sh
+++ b/install.sh
@@ -2,9 +2,9 @@
 # This Script aims to setup a docker environment for OSX (Maybe Linux) with docker client, docker-machine and docker-compose
 # All binaries are installed in /usr/local/bin/ directory.
 
-DOCKER_VERSION="1.9.1"
-DOCKER_MACHINE_VERSION="0.5.5"
-#DOCKER_COMPOSE_VERSION="1.5.0rc1"
+DOCKER_VERSION="1.10.0-rc1"
+DOCKER_MACHINE_VERSION="0.6.0-rc1"
+DOCKER_COMPOSE_VERSION="1.6.0-rc1"
 
 RED='\033[0;31m'
 GREEN='\033[0;32m'
@@ -33,19 +33,16 @@ do_install() {
 
 
   # Install Docker Compose
-  docker_compose_bin_url="https://dl.bintray.com/docker-compose/master/docker-compose-$os-$arch"
-  echo "\n${GREEN}>> Download Docker compose (Master)${NC}"
+  docker_compose_bin_url="https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-$os-$arch"
   echo $docker_compose_bin_url
   curl --progress-bar -L $docker_compose_bin_url > /usr/local/bin/docker-compose
   chmod +x /usr/local/bin/docker-compose
-
-
 }
 
 do_create_machine() {
   # Create a Docker machine on virtualbox
   echo "\n${GREEN}>> Create a dev machine on virtualbox${NC}"
-  docker-machine create --driver virtualbox dev
+  docker-machine create --driver virtualbox --virtualbox-boot2docker-url https://github.com/tianon/boot2docker-legacy/releases/download/v1.10.0-rc1/boot2docker.iso dev 
 }
 
 do_configure_nfs() {
@@ -79,9 +76,14 @@ EOF)
 
   bootsync=$(echo "$bootsync" | sed -e "s/{{IP}}/$vboxnet_ip/g")
 
+  echo "Bootsync"
+  echo "$bootsync"
+
   docker-machine ssh dev "echo \"$bootsync\" > /tmp/bootsync.sh"
   docker-machine ssh dev "sudo mv /tmp/bootsync.sh /var/lib/boot2docker/bootsync.sh"
-  docker-machine restart dev
+  docker-machine ssh dev "sudo chmod +x /var/lib/boot2docker/bootsync.sh"
+  docker-machine ssh dev "sudo chown root:root /var/lib/boot2docker/bootsync.sh"
+  echo "You need to restart your dev machine with : docker-machine restart dev"
 }
 
 read -p "Do you want to install docker, docker-machine and docker-compose? (y/n)" answer

From a64543aac27657c6bb8c08861823c80b98605e8e Mon Sep 17 00:00:00 2001
From: Mathieu Fosse <mathieu@tigerlilyapps.com>
Date: Thu, 28 Jan 2016 23:34:04 +0100
Subject: [PATCH 2/5] Update install.sh

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index a85238f..c1cfa77 100755
--- a/install.sh
+++ b/install.sh
@@ -2,7 +2,7 @@
 # This Script aims to setup a docker environment for OSX (Maybe Linux) with docker client, docker-machine and docker-compose
 # All binaries are installed in /usr/local/bin/ directory.
 
-DOCKER_VERSION="1.10.0-rc1"
+DOCKER_VERSION="1.10.0-rc2"
 DOCKER_MACHINE_VERSION="0.6.0-rc1"
 DOCKER_COMPOSE_VERSION="1.6.0-rc1"
 

From 89396bd5bac412b53caef09e282a72b7d49eb3fb Mon Sep 17 00:00:00 2001
From: Mathieu Fosse <mathieu@tigerlilyapps.com>
Date: Mon, 8 Feb 2016 19:47:43 +0100
Subject: [PATCH 3/5] Update install.sh

---
 install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index c1cfa77..fb1d787 100755
--- a/install.sh
+++ b/install.sh
@@ -2,9 +2,9 @@
 # This Script aims to setup a docker environment for OSX (Maybe Linux) with docker client, docker-machine and docker-compose
 # All binaries are installed in /usr/local/bin/ directory.
 
-DOCKER_VERSION="1.10.0-rc2"
-DOCKER_MACHINE_VERSION="0.6.0-rc1"
-DOCKER_COMPOSE_VERSION="1.6.0-rc1"
+DOCKER_VERSION="1.10.0"
+DOCKER_MACHINE_VERSION="0.6.0"
+DOCKER_COMPOSE_VERSION="1.6.0"
 
 RED='\033[0;31m'
 GREEN='\033[0;32m'

From 774a30ed443be255bdcea335213e58c0eae458f0 Mon Sep 17 00:00:00 2001
From: Mathieu Fosse <mathieu@tigerlilyapps.com>
Date: Mon, 8 Feb 2016 21:45:07 +0100
Subject: [PATCH 4/5] Update install.sh

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index fb1d787..f7301e3 100755
--- a/install.sh
+++ b/install.sh
@@ -25,7 +25,7 @@ do_install() {
 
 
   # Install Docker machine
-  docker_machine_bin_url="https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_$(echo $os| tr '[:upper:]' '[:lower:]')-amd64"
+  docker_machine_bin_url="https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine-$os-$arch"
   echo "\n${GREEN}>> Download Docker machine ($DOCKER_MACHINE_VERSION)${NC}"
   echo $docker_machine_bin_url
   curl --progress-bar -L $docker_machine_bin_url > /usr/local/bin/docker-machine

From c9c03d7a84735604dda0d2b2f42e8bee664189bd Mon Sep 17 00:00:00 2001
From: Mathieu Fosse <mathieu@tigerlilyapps.com>
Date: Mon, 8 Feb 2016 21:48:15 +0100
Subject: [PATCH 5/5] Update install.sh

---
 install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install.sh b/install.sh
index f7301e3..d0b0341 100755
--- a/install.sh
+++ b/install.sh
@@ -34,6 +34,7 @@ do_install() {
 
   # Install Docker Compose
   docker_compose_bin_url="https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-$os-$arch"
+  echo "\n${GREEN}>> Download Docker compose ($DOCKER_COMPOSE_VERSION)${NC}"
   echo $docker_compose_bin_url
   curl --progress-bar -L $docker_compose_bin_url > /usr/local/bin/docker-compose
   chmod +x /usr/local/bin/docker-compose