Merge pull request boot2docker#7 from SvenDowideit/0.9.2-cli

use b2d-cli 0.9.2 and add new logo artwork

Dockerfile

@@ -1,13 +1,9 @@
 FROM debian:wheezy
 MAINTAINER Steeve Morin "steeve.morin@gmail.com"
 
-ENV DOCKER_VERSION  0.11.1
-ENV BOOT2DOCKER_CLI_VERSION 0.9.0
-
 # make sure the package repository is up to date
 RUN apt-get update
 
-
 RUN apt-get -y install  curl \
                         build-essential \
                         libxml2-dev libssl-dev \
@@ -27,6 +23,10 @@ RUN curl -L https://github.com/downloads/mackyle/xar/xar-1.6.1.tar.gz | tar xvz
 
 ADD mpkg /mpkg
 
+ENV DOCKER_VERSION  0.11.1
+ENV BOOT2DOCKER_CLI_VERSION 0.9.2
+ENV INSTALLER_VERSION 0.2
+
 # Downloading VirtualBox and extract the .pkg
 RUN mkdir -p /mpkg/vbox && \
     cd /mpkg/vbox && \
@@ -66,7 +66,7 @@ RUN cd /mpkg/docker.pkg && \
 RUN cd /mpkg/boot2docker.pkg && \
     mkdir ./rootfs && \
     cd ./rootfs && \
-    curl -L -o boot2docker https://github.com/boot2docker/boot2docker-cli/releases/download/v${BOOT2DOCKER_CLI_VERSION}/boot2docker-cli-v${BOOT2DOCKER_CLI_VERSION}-darwin-amd64 && \
+    curl -L -o boot2docker https://github.com/boot2docker/boot2docker-cli/releases/download/v${BOOT2DOCKER_CLI_VERSION}/boot2docker-v${BOOT2DOCKER_CLI_VERSION}-darwin-amd64 && \
     chmod +x boot2docker && \
     find . | cpio -o --format odc | gzip -c > ../Payload && \
     mkbom . ../Bom && \

mpkg/Distribution

@@ -3,7 +3,7 @@
     <title>docker_title</title>
     <options customize="allow" allow-external-scripts="yes" rootVolumeOnly="true" hostArchitectures="i386"/>
     <domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true"/>
-    <background file="logo-docker_transparent.png" alignment="center" scaling="proportional"/>
+    <background file="boot2docker.png" alignment="bottomleft" scaling="none"/>
     <welcome file="Welcome.html" mime-type="text/html"/>
     <choices-outline>
         <line choice="choiceDockerCLI"/>
@@ -27,7 +27,7 @@
     <pkg-ref id="io.boot2docker.pkg.boot2docker">
         <bundle-version/>
     </pkg-ref>
-    <product id="io.docker.mpkg.docker" version="0.0.1"/>
+    <product id="io.docker.mpkg.docker" version="%INSTALLER_VERSION%"/>
 
     <!-- Manually imported VBox Stuff -->
     <installation-check script="checkPrerequisite()"/>