Merge branch 'master' of github.com:docker/toolbox

osx/mpkg/Distribution

@@ -2,7 +2,7 @@
 <installer-gui-script minSpecVersion="1">
     <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"/>
+    <domains enable_localSystem="true"/>
     <background file="toolbox.png" alignment="bottomleft" scaling="none"/>
     <welcome file="Welcome.html" mime-type="text/html"/>
     <conclusion file="Installed.html" mime-type="text/html"/>

osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh

@@ -1,16 +1,27 @@
+#!/bin/bash
+
+set -e
+
 ISO=$HOME/.docker/machine/cache/boot2docker.iso
 VM=dev
 DOCKER_MACHINE=/usr/local/bin/docker-machine
 
+BLUE='\033[0;34m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+
 unset DYLD_LIBRARY_PATH
 unset LD_LIBRARY_PATH
 
+clear
+
 mkdir -p ~/.docker/machine/cache
 if [ ! -f $ISO ]; then
   cp /usr/local/share/boot2docker/boot2docker.iso $ISO
 fi
 
-machine=$($DOCKER_MACHINE ls -q | grep "^$VM$")
+
+machine=$($DOCKER_MACHINE ls -q | grep "^$VM$") || :
 if [ -z $machine ]; then
   echo "Creating Machine $VM..."
    $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM
@@ -19,10 +30,9 @@ else
 fi
 
 echo "Starting machine $VM..."
-$DOCKER_MACHINE start dev
+$DOCKER_MACHINE start $VM
 
 echo "Setting environment variables for machine $VM..."
-eval $($DOCKER_MACHINE env dev --shell=bash)
 clear
 
 cat << EOF
@@ -39,7 +49,7 @@ cat << EOF
 
 
 EOF
-echo "The Quick Start CLI is configured to use Docker with the $VM VM"
+echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}dev${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip dev)${NC}"
 echo
 
-bash -c "$SHELL"
+eval $($DOCKER_MACHINE env $VM --shell=bash)

site/layouts/index.html

@@ -34,28 +34,21 @@
         <div class="info">
           <img src="{{.Site.BaseURL}}/images/engine.png">
           <h3>Docker Engine</h3>
-          <p>Creates and runs Docker containers.</p>
+          <p>Create and runs Docker containers.</p>
         </div>
       </div>
       <div class="item">
         <div class="info">
           <img src="{{.Site.BaseURL}}/images/machine.png">
           <h3>Docker Machine</h3>
-          <p>Provisions Docker to local or remote machines.</p>
+          <p>Provision Docker-ready local or remote machines.</p>
         </div>
       </div>
       <div class="item">
         <div class="info">
           <img src="{{.Site.BaseURL}}/images/compose.png">
           <h3>Docker Compose</h3>
-          <p>Define multi-container applications. (Mac OS X only)</p>
+          <p>Define multi-container applications. (OS X only)</p>
-        </div>
-      </div>
-      <div class="item">
-        <div class="info">
-          <img src="{{.Site.BaseURL}}/images/swarm.png">
-          <h3>Docker Swarm</h3>
-          <p>Host clustering and container scheduling.</p>
         </div>
       </div>
       <div class="item">
@@ -92,7 +85,7 @@
           <ol>
             <li>Open a terminal or the Docker CLI on your system.</li>
             <li>Type the following command.<br>
-                <pre>docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm</pre>
+                <pre>docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm dev</pre>
             </li>
             <li>Use the <code>docker-machine</code> command to interact with the migrated VM.  </li>
           </ol>

site/static/css/main.css

@@ -290,14 +290,18 @@ table {
   -ms-flex-flow: row wrap;
   flex-flow: row wrap;
 }
+.content .items .item {
+  text-align: center;
+}
 .content .items .item img {
   width: 100px;
   height: auto;
 }
 .content .items .item .info {
-  padding-right: 1rem;
+  padding-right: 1.5rem;
 }
 .content .documentation {
+  text-align: center;
   padding: 2rem 0;
 }
 .content .documentation h3 {
@@ -309,8 +313,7 @@ table {
 }
 .content .documentation .cta .btn {
   display: inline-block;
-  margin-right: 1rem;
+  margin: 0.5rem;
-  margin-bottom: 1rem;
   transition: all 100ms;
   background-color: #ff992e;
   box-shadow: 0.4rem 0.4rem 0 rgba(0, 0, 0, 0.05);
@@ -348,8 +351,8 @@ table {
 }
 @media screen and (min-width: 500px) {
   .items .item {
-    max-width: 20%;
+    max-width: 25%;
-    min-width: 140px;
+    min-width: 160px;
   }
 }
 .footer {

site/static/less/layout.less

@@ -142,16 +142,18 @@
     .flex-display();
     .flex-flow(row wrap);
     .item {
+      text-align: center;
       img {
         width: 100px;
         height: auto;
       }
       .info {
-        padding-right: 1rem;
+        padding-right: 1.5rem;
       }
     }
   }
   .documentation {
+    text-align: center;
     padding: 2rem 0;
     h3 {
       color: fade(white, 70%);
@@ -161,8 +163,7 @@
       padding: 1rem 0 0 0;
       .btn {
         display: inline-block;
-        margin-right: 1rem;
+        margin: 0.5rem;
-        margin-bottom: 1rem;
         transition: all 100ms;
         background-color: @brand-orange;
         box-shadow: 0.4rem 0.4rem 0 fade(black, 5%);
@@ -212,8 +213,8 @@
 @media screen and (min-width: 500px) {
   .items {
     .item {
-      max-width: 20%;
+      max-width: 25%;
-      min-width: 140px;
+      min-width: 160px;
     }
   }
 }