From b651d59ecf019060f307e82e7db8f6a8756bc2ff Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Mon, 13 Oct 2014 12:38:14 +0100
Subject: [PATCH 1/5] Fix syntax error in makedmg.sh

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 makedmg.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makedmg.sh b/makedmg.sh
index aceb080..964e7a8 100644
--- a/makedmg.sh
+++ b/makedmg.sh
@@ -16,7 +16,7 @@ else
     TITLE=$2
     CONTENTDIR=$3
     FILESIZE=$(du -sm "${CONTENTDIR}" | cut -f1)
-    FILESIZE=$(("${FILESIZE}" + 5))
+    FILESIZE=$((${FILESIZE} + 5))
     USER=$(whoami)
     TMPDIR="/tmp/dmgdir"
 

From 3fe51a4520b2fe510b59b6d1822f84908f6f863b Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Mon, 13 Oct 2014 15:16:17 +0100
Subject: [PATCH 2/5] Add makefile for building

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 Makefile  | 15 +++++++++++++++
 README.md |  7 +------
 2 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..40a18e8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+DOCKER_IMAGE := osx-installer
+DOCKER_CONTAINER := build-osx-installer
+
+default: dockerbuild
+	@true
+
+dockerbuild: clean
+	docker build -t $(DOCKER_IMAGE) .
+	docker run --privileged -i -t --name "$(DOCKER_CONTAINER)" "$(DOCKER_IMAGE)"
+	docker cp "$(DOCKER_CONTAINER)":/dmg/Docker.pkg .
+
+clean:
+	rm -f Docker.pkg
+	docker rm "$(DOCKER_CONTAINER)" 2>/dev/null || true
+
diff --git a/README.md b/README.md
index 923119e..550c47f 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,4 @@ Installation [instructions](http://docs.docker.io/installation/mac/) available o
 How to build
 ============
 
-```
-$ docker rm build-osx-installer;true &&\
- docker build -t osx-installer . &&\
- docker run --privileged -i -t --name build-osx-installer osx-installer &&\
- docker cp build-osx-installer:/dmg/Docker.pkg .
-```
+Running `make` will produce a `Docker.pkg` installer.

From a02b9dcc8b5e99bd0018adc4a31b9e52c6164f99 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Mon, 13 Oct 2014 15:58:19 +0100
Subject: [PATCH 3/5] Use $(boot2docker shellinit) to init app

@@ -10,6 +10,7 @@
    do script "mkdir -p ~/.boot2docker" in newWindow
    do script "if [ ! -f ~/.boot2docker/boot2docker.iso ]; then cp /usr/local/share/boot2docker/boot2docker.iso ~/.boot2docker/ ; fi" in newWindow
    do script b2d & " init " in newWindow
-   do script b2d & " up && export DOCKER_HOST=tcp://$(/usr/local/bin/boot2docker ip 2>/dev/null):2375" in newWindow
+   do script b2d & " up " in newWindow
+   do script "$(" & b2d & " shellinit)" in newWindow
    do script "docker version" in newWindow
 end tell

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 .../Contents/Resources/Scripts/main.scpt      | Bin 3516 -> 3664 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/mpkg/boot2docker.app/Contents/Resources/Scripts/main.scpt b/mpkg/boot2docker.app/Contents/Resources/Scripts/main.scpt
index 9ad9f5252f73e668cf9b01e095c9054e705f455b..7a557602b796009d1a5b739bbfe9f35f116ab07d 100644
GIT binary patch
delta 854
zcmYjPOHWfl6#nM6mUen?X|WNtpcPA^Q3<dzZYl|CjS_+p5qVx(T1qbzX~D#eap_Jo
zKfyH%mIjdbQ)v+5QlbkN{s1>7dOWum4U^2wnK_T|obR0Z$X?CshKtj1(;xb6zzwY(
z_L{~Ccnm&7j$dv}&32sj`n-r@3KNJb-FL4VodzDlbr%|Xk)s1VLYJh2H!mYE43@Pa
z_Uy$l9;4gf<LGVT33?1Z#8_EBfZhO`iCOf8(8o|QTr$uDk!SS)25H|<`>1GyYp6K|
z80dC9O{CBtK)>xd5Ms+yoLm7T3}{`0g)GK-7jfBxF1Y9uN7|Eoxn(Y$wG0e82x(;0
zH(#t4om_@VB?G2Yl7%VS#SoH`cDbZJgXMC{7V=017@dKKLkw5Lavn+KSf1o0rptGM
z(eoJhu);+jk){uluYc%i2YmuhX~$1HYFR&X&O;vnjY@Wr9tR5$$W$UDcD(9>e4rYo
z`^HU8z_hXjrU$~}tcBiYCbQ$kd|@P-XtlqOtx`B%m$<?oG4r;Xku4RmSI<lF_V4Pa
zY-}ino2pn9f)^;oTRyWaSY}h+w>Wh3@yM#pe<yMlI@*|{WSQV1muPbyMFOqrtv?ao
z=2uqGHV|Y<(3Yev)uczN1ME-{q)m*{2CXw$7OhFzWL<6ds555v*o|ozvumPNjaE4w
z+ORoUx5M!y2D!0eWN3w!5u_zrL=C-19WBs2&7ld`5$8-gc%J%^lC;8&bNOkR>5Ygb
z^+i8_b&*?8OeKqc_WM6nk`|6SBWd0?$QCV0bLyQd;tSClo_(!CLESfc>No36RMr1j
Zv2=)b6DJ+1vl3<@ImzT1zYY&){sQL|+v)%S

delta 658
zcmXX@OHWf#5dO|>ZOdtITTlW`Av8ivRZy%NjfqyG#2OYY*3wc6ZSBJ}R57I(S^5to
zXQvzD%7revbK!zko&u#n+!D7Y{sI#n=L&an=W*tn@64HL^?dQZxzt~Tnf}rr9cE}@
z7+(>mV9{BLS&qyo)W*AQqwnFv0$#8_$Kpc)uQ-}R1yzpjBaC|(!zdmhjSxpsJjQL#
z<rsAfmstkjSEsdW7Z_gpPZYo%KF%}MOSaFMzRYr-;Q?I54O~|h+gKMJ>P%&N2n{I|
z=m0THNIF=0?e*yFi)Y+qiZ6{j5r?QD(T;?2OJCmvOtg<lYDqR`Ia@51bxcCcaX|)I
z^{#E8n+^dTmSYw`An8I<e73128Bxp9;<>8{WXq*_u7OB$55f|TCWgXMMszy%7Jq#R
zT{LotD6f6Q3jf<?u(_ae_F@0tV#daacCc;+N4~Q!3?C8x!%Q`J!c@0Ea5=dNV`vEs
z8CLZ>LT8$oLP}5*aI+_9SJJMkIlNs?ez4U|JD8?z`i2>#X-m=$=Xzt)$7?gzn9=y1
z+%auxw8@v#HlQ({>1GU-MhB9#LF;hS8m*#-zTzx3s7@=mf}05PBF7Pzw86tR*=b!Z
zw|UsEsjS{NxXLrF=5tj$S6PQ)dJ@P3k{TzYmQ*(YrD|Eyiu$PcTDS1@M+b7MrB8MK
VY?K`kF&DD)xeAX(|9y1y=^wSls^S0u


From af4a45b13b92f97b0518171eed6c787350665713 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Tue, 14 Oct 2014 11:06:52 +0100
Subject: [PATCH 4/5] Update virtualbox to 4.3.18

As per https://github.com/boot2docker/boot2docker/pull/567

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 49a7184..dbbac83 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,8 @@ RUN curl -L https://github.com/downloads/mackyle/xar/xar-1.6.1.tar.gz | tar xvz
     ./configure && \
     make && make install
 
-ENV VBOX_VERSION 4.3.14
-RUN curl -L -o vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VirtualBox-$VBOX_VERSION-95030-OSX.dmg
+ENV VBOX_VERSION 4.3.18
+RUN curl -L -o vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VirtualBox-$VBOX_VERSION-96516-OSX.dmg
 
 # Download the Docker parts
 

From 9d169434919b2b48cf210d0934776582ac046e5e Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Mon, 13 Oct 2014 15:19:18 +0100
Subject: [PATCH 5/5] Bump to version 1.3.0

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 Dockerfile                               | 8 ++++----
 mpkg/boot2docker.app/Contents/Info.plist | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dbbac83..ab09941 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,10 +26,10 @@ RUN curl -L -o vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERSION/
 
 # Download the Docker parts
 
-ENV DOCKER_VERSION  1.2.0
-ENV BOOT2DOCKER_CLI_VERSION 1.2.0
-ENV BOOT2DOCKER_ISO_VERSION 1.2.0
-ENV INSTALLER_VERSION 1.2.0
+ENV DOCKER_VERSION  1.3.0
+ENV BOOT2DOCKER_CLI_VERSION 1.3.0
+ENV BOOT2DOCKER_ISO_VERSION 1.3.0
+ENV INSTALLER_VERSION 1.3.0
 
 RUN curl -L -o /docker.tgz http://get.docker.io/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz
 RUN curl -L -o /boot2docker https://github.com/boot2docker/boot2docker-cli/releases/download/v${BOOT2DOCKER_CLI_VERSION}/boot2docker-v${BOOT2DOCKER_CLI_VERSION}-darwin-amd64
diff --git a/mpkg/boot2docker.app/Contents/Info.plist b/mpkg/boot2docker.app/Contents/Info.plist
index 0bcd575..0a5eae8 100644
--- a/mpkg/boot2docker.app/Contents/Info.plist
+++ b/mpkg/boot2docker.app/Contents/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.2</string>
+	<string>1.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>aplt</string>
 	<key>LSMinimumSystemVersionByArchitecture</key>