From 65d6b97b82d07c426c4155008463109c16b2181a Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Mon, 13 Jul 2015 16:25:10 -0700
Subject: [PATCH 1/7] Stop on error on Mac OS X

---
 .../Docker CLI.app/Contents/Resources/Scripts/start.sh     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh

diff --git a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh
old mode 100644
new mode 100755
index 4ce49464be..455658e3a2
--- a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh	
+++ b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh	
@@ -1,3 +1,7 @@
+#!/bin/bash
+
+set -e
+
 ISO=$HOME/.docker/machine/cache/boot2docker.iso
 VM=dev
 DOCKER_MACHINE=/usr/local/bin/docker-machine
@@ -10,7 +14,8 @@ 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

From 9c4538725646c9450da73ba50d0c0bb502c4243b Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Tue, 14 Jul 2015 00:10:36 -0700
Subject: [PATCH 2/7] Fix bash startup script on mac

---
 .../Contents/Resources/Scripts/main.scpt      | Bin 3672 -> 3672 bytes
 .../Contents/Resources/Scripts/start.sh       |  18 ++++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt
index fbc1360de5f810a3360cc405cdd28d2f3a4734a0..14203852c863c1d1794ca4a927cc5cfa672511f6 100644
GIT binary patch
delta 23
ecmca1b3<l>Aumf>Vovd7Q{Ep;Y}J$X`7{A%<p;_D

delta 23
fcmca1b3<l>AumfwQEBRAQ{Ep;T!$y?^JxMAYVrs$

diff --git a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh
index 455658e3a2..904bdd166a 100755
--- a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh	
+++ b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh	
@@ -6,9 +6,15 @@ 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
@@ -24,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
@@ -44,7 +49,12 @@ 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"
+if [[ $SHELL == *"fish" ]]; then
+  $SHELL -c "eval ($DOCKER_MACHINE env $VM)"
+else
+  $SHELL -c "eval $($DOCKER_MACHINE env $VM)"
+fi
+

From dd0c4fd3c2d97b0692305ce5c77b414d0f81d91b Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Tue, 14 Jul 2015 00:17:12 -0700
Subject: [PATCH 3/7] Fix wording & centering

---
 site/layouts/index.html      | 6 +++---
 site/static/css/main.css     | 5 +++--
 site/static/less/layout.less | 5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/site/layouts/index.html b/site/layouts/index.html
index d573b253d3..c7ffebea8f 100755
--- a/site/layouts/index.html
+++ b/site/layouts/index.html
@@ -34,21 +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">
diff --git a/site/static/css/main.css b/site/static/css/main.css
index 7a17ac75f3..74a81ce03b 100755
--- a/site/static/css/main.css
+++ b/site/static/css/main.css
@@ -295,9 +295,11 @@ table {
   height: auto;
 }
 .content .items .item .info {
+  text-align: center;
   padding-right: 1rem;
 }
 .content .documentation {
+  text-align: center;
   padding: 2rem 0;
 }
 .content .documentation h3 {
@@ -309,8 +311,7 @@ table {
 }
 .content .documentation .cta .btn {
   display: inline-block;
-  margin-right: 1rem;
-  margin-bottom: 1rem;
+  margin: 0.5rem;
   transition: all 100ms;
   background-color: #ff992e;
   box-shadow: 0.4rem 0.4rem 0 rgba(0, 0, 0, 0.05);
diff --git a/site/static/less/layout.less b/site/static/less/layout.less
index 5cdbdf7495..f5eeb7a7a7 100755
--- a/site/static/less/layout.less
+++ b/site/static/less/layout.less
@@ -147,11 +147,13 @@
         height: auto;
       }
       .info {
+        text-align: center;
         padding-right: 1rem;
       }
     }
   }
   .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-bottom: 1rem;
+        margin: 0.5rem;
         transition: all 100ms;
         background-color: @brand-orange;
         box-shadow: 0.4rem 0.4rem 0 fade(black, 5%);

From b16944d30e846bba58bd0445032e0412109ae0dd Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Tue, 14 Jul 2015 00:38:29 -0700
Subject: [PATCH 4/7] Fix broken custom install location button

---
 osx/mpkg/Distribution | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osx/mpkg/Distribution b/osx/mpkg/Distribution
index 670d595dad..b7940b53db 100644
--- a/osx/mpkg/Distribution
+++ b/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"/>

From 75ee11b1c9ed5b7f95f62be21506e52cc1708c0b Mon Sep 17 00:00:00 2001
From: Sean Li <mail@shang.li>
Date: Tue, 14 Jul 2015 11:44:32 -0700
Subject: [PATCH 5/7] Deleted Swarm and centered included items.

---
 site/layouts/index.html      | 7 -------
 site/static/css/main.css     | 9 ++++++---
 site/static/less/layout.less | 7 ++++---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/site/layouts/index.html b/site/layouts/index.html
index d573b253d3..f8d3a0f727 100755
--- a/site/layouts/index.html
+++ b/site/layouts/index.html
@@ -51,13 +51,6 @@
           <p>Define multi-container applications. (Mac 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">
         <div class="info">
           <img src="{{.Site.BaseURL}}/images/kitematic.png">
diff --git a/site/static/css/main.css b/site/static/css/main.css
index 7a17ac75f3..018eed2698 100755
--- a/site/static/css/main.css
+++ b/site/static/css/main.css
@@ -290,12 +290,15 @@ 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 {
   padding: 2rem 0;
@@ -348,8 +351,8 @@ table {
 }
 @media screen and (min-width: 500px) {
   .items .item {
-    max-width: 20%;
-    min-width: 140px;
+    max-width: 25%;
+    min-width: 160px;
   }
 }
 .footer {
diff --git a/site/static/less/layout.less b/site/static/less/layout.less
index 5cdbdf7495..65acfca9be 100755
--- a/site/static/less/layout.less
+++ b/site/static/less/layout.less
@@ -142,12 +142,13 @@
     .flex-display();
     .flex-flow(row wrap);
     .item {
+      text-align: center;
       img {
         width: 100px;
         height: auto;
       }
       .info {
-        padding-right: 1rem;
+        padding-right: 1.5rem;
       }
     }
   }
@@ -212,8 +213,8 @@
 @media screen and (min-width: 500px) {
   .items {
     .item {
-      max-width: 20%;
-      min-width: 140px;
+      max-width: 25%;
+      min-width: 160px;
     }
   }
 }

From 7291c75daaa69050a7188c0ebd6d6aca01beb7b0 Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Tue, 14 Jul 2015 11:46:58 -0700
Subject: [PATCH 6/7] Fix env loading on mac os x

---
 .../Contents/Resources/Scripts/main.scpt      | Bin 3672 -> 3750 bytes
 .../Contents/Resources/Scripts/start.sh       |   7 +------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt
index 14203852c863c1d1794ca4a927cc5cfa672511f6..42e712fdbb8e61f79098c1f89fc0875f63f3bd30 100644
GIT binary patch
delta 907
zcmYk4Nl#Nz6vzMfz0#6fUI#G&Q<@MJH6{)Vhm9bJqRgTc(8Qr&QKV9BtKtg3f_a}o
zRFp|%azH^80Tq_6Txy~l*KYovYh&U|?m73oGyU$l_e;rObnKUBOE<RhJHI*D2CErB
zF}krGI~)<JSL_lbCJOToSVbsza0qrSEYzTt>!`qC&2{&pFFH^GbxmSxP>ad{Dxt<v
z6-E{E(TO-RxZ=fO*j&RAe%7Kqy0^P0>EH;geF|v6Nq$1L7U9udw|n{=ROc!-p_w0T
zeuVP!Go*F7tfO3Ya5RS!LxL+l97B!fieafZ2CGw8VmOQAIN^x+%N9ciY6Ai&Y;|GO
z!Gql>b#MYICE*=7!(~60-FaX1e2uVvKs}eVsDG^WIo5NC^F120h<~gNxega_k?(B2
zGptL(%2mL@j-0a?o6s0Uqgu&#tMXg!t>;aIR93lO9f~z^(LodJq?}DYzU2bv72g7i
z3r5VFYKuU?1O!8{;pH1N%hX<@g>y;_gv9pn6<_iNpKHEysUx<ZFJ0v=6a7LC7AaAD
zZmOJwFT`1#;tZ#8S}t=+b5;_f1E+GA4tWGIOJ-;x4{a9OWD`QWg?8C&<)p<)!!={L
zrcLkDMzmrhf_%maKIJ&aP|8t`aF|c{m_vNThkU?6RPsJ*HJ{1&uBUJI`8k2jdlAeg
z(${)izc*5(`BZ%A?49eH<7UX&{;cMhJ7OE(sL9Lpi*H1BnQZ!opTp*G`!%1KXn8)G
zk5Rn4E0s=MN+tUHZYGoDT{BvwI<J;$4oO^RDwWiH<i@=bTl1kiCfd&j?wZ~t_MjW}
zMS@yTbJri{6fV1K1rb&6{w&yaFpdp7fAsE279h|ZN8xhWe?MZ9_Zs<r>2Rw%p3DT$
cVjf*b7#(h<GZ$8z1LB#kG!zPcfBicA2exAvRR910

delta 850
zcmXX^O-~b16g_XIl;)KwMNKThCL~&{26SUwDS{TXpq7vL5f{cnAet6h+kzSw`V%zs
zA3#99K~N9{6$BNC8+Ai88ZfS0yE)zw-{RhT=AOKF?zz(w{Jdx6w`=bulyQrj7Rq46
z00eLe`w_MzsD$7>xH!Hu@2Ihx>lTi|jKV-IE^-aWQK`9RU&{|hj>BjXZY}C@0#%j-
z)$tEUQSC!D)F@6C;UqL#5Jwi*QEH(IDkY>S>bUCVs(sZHyjls9A8?BAwIr8LwBJZt
zI0fT~0?wm}?-0=vT)OqvjZO=Z?ROf`$Q6?-P;R~l46Xwf!rRRNicwRD8nxniI3Ihs
zo<HtaIn}1P1t@L`9U*5XE?Y8ynUq=%-*SnIif<j#k`or4i<bePLn!pagqv@08fW<0
znL!DFU$Bd>xWIY7)O=-oyg{{KD|g8Ba$Y7Zk^IswvWoBda0dB)zCb<a_#9_(j<Z@|
z;847+JC};5)16((ByeBEJitLYmbm+GC6E=JH^dJEd59T^N#RF>fd(n|amL_`BY4gc
z{M-?B)(PjZ6NP-nr<~>#!%tAkNltK_V;toOhdIPSK1MYMG@psX=}cFrmrot>yEUif
zOD1<GtvThmpSzvYd}0roCDNO8*xB3Cn~*A-%iQ#G+!@x=9CO&RE6q`RupsCi5!{kW
zB{hfbxVyyE9I{6wdpRh!l&Hscg%vz7AS`G1MV!UuuiwhsQ1dZ%;QNnc0rECOTjf8?
zYre$3?!YlSYgL4oLvidl_$zT(+P({gS{CB*$|K$F@nqH~%aPx&u?UU!Cu{DC4|Pzx
z(BwlC%mA9%&pscT;VKq)9<i4_nvedAHreaGtJx#hCE7C`(MV~jX1_FZxp<4oKB#!M
NH3Nl$KN}l^e*w>14P^iT

diff --git a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh
index 904bdd166a..4d2ac3fd68 100755
--- a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh	
+++ b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh	
@@ -52,9 +52,4 @@ EOF
 echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}dev${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip dev)${NC}"
 echo
 
-if [[ $SHELL == *"fish" ]]; then
-  $SHELL -c "eval ($DOCKER_MACHINE env $VM)"
-else
-  $SHELL -c "eval $($DOCKER_MACHINE env $VM)"
-fi
-
+eval $($DOCKER_MACHINE env $VM --shell=bash)

From 2940c98332a8ec569f7aac4257b17579f1be1557 Mon Sep 17 00:00:00 2001
From: Sean Li <mail@shang.li>
Date: Tue, 14 Jul 2015 11:50:10 -0700
Subject: [PATCH 7/7] Uses dev instead of docker-vm.

---
 site/layouts/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/layouts/index.html b/site/layouts/index.html
index 41c7cbbc88..bdc12c54fa 100755
--- a/site/layouts/index.html
+++ b/site/layouts/index.html
@@ -85,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>