Merge pull request #74 from bfirsh/ship-1.3.0

WIP: Ship 1.3.0

Dockerfile

@@ -21,15 +21,15 @@ 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
 
-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

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
+

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.

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"
 

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>