From 38abeccb39865938cc1879e2fd0a7d6c3bc260ba Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Tue, 4 Aug 2015 11:25:44 -0700
Subject: [PATCH] Bump to 1.8.0-rc4

---
 osx/Dockerfile                                  | 14 +++++++-------
 osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osx/Dockerfile b/osx/Dockerfile
index 40eaf4ab83..43a93a6f84 100644
--- a/osx/Dockerfile
+++ b/osx/Dockerfile
@@ -26,26 +26,26 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
 
 # Download the Docker parts
 
-ENV DOCKER_VERSION 1.8.0-rc1
+ENV DOCKER_VERSION 1.8.0-rc2
 RUN curl -fsSL -o /docker https://test.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
 RUN chmod +x /docker
 
-ENV DOCKER_MACHINE_VERSION 0.4.0-rc1
+ENV DOCKER_MACHINE_VERSION 0.4.0-rc2
 RUN curl -fsSL -o /docker-machine https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_darwin-amd64
 RUN chmod +x /docker-machine
 
-ENV DOCKER_COMPOSE_VERSION 1.4.0rc2
+ENV DOCKER_COMPOSE_VERSION 1.4.0rc3
 RUN curl -fsSL -o /docker-compose https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Darwin-x86_64
 RUN chmod +x /docker-compose
 
 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
-# RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v${BOOT2DOCKER_ISO_VERSION}/boot2docker.iso
-RUN curl -fsSL -o /boot2docker-virtualbox.iso https://s3.amazonaws.com/toolbox-rc/boot2docker-virtualbox-1.8.0-dev.iso
+RUN curl -fsSL -o /boot2docker.iso https://github.com/tianon/boot2docker-legacy/releases/download/v1.8.0-rc2/boot2docker.iso
 
 ENV KITEMATIC_VERSION 0.8.0-rc3
 RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip
 
-ENV INSTALLER_VERSION $DOCKER_VERSION
+# ENV INSTALLER_VERSION $DOCKER_VERSION
+ENV INSTALLER_VERSION 1.8.0-rc4
 
 # Start building package
 
@@ -127,7 +127,7 @@ RUN cd /mpkg/boot2dockeriso.pkg && \
   rm -r Scripts && mv Scripts.bin Scripts && \
 	mkdir ./rootfs && \
 	cd ./rootfs && \
-	cp /boot2docker-virtualbox.iso . && \
+	cp /boot2docker.iso . && \
 	find . | cpio -o --format odc | gzip -c > ../Payload && \
 	mkbom . ../Bom && \
 	sed -i \
diff --git a/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall b/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall
index 06b3a3038b..c782e29f20 100755
--- a/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall
+++ b/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 mkdir -p ~/.docker/machine/cache
-cp /usr/local/share/boot2docker/boot2docker-virtualbox.iso ~/.docker/machine/cache/boot2docker-virtualbox.iso
+cp /usr/local/share/boot2docker/boot2docker.iso ~/.docker/machine/cache/boot2docker.iso
 chown -R $USER:staff ~/.docker