From 3a9ad9f478de139e3c5c2ae2171984336f43e8d8 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 13 Jul 2015 16:06:54 -0700 Subject: [PATCH 1/9] Proper signing --- osx/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/osx/Makefile b/osx/Makefile index 2b99ba359f..666f4749b3 100644 --- a/osx/Makefile +++ b/osx/Makefile @@ -8,7 +8,9 @@ dockerbuild: clean docker build -t $(DOCKER_IMAGE) . docker run --privileged -i -t --name "$(DOCKER_CONTAINER)" "$(DOCKER_IMAGE)" docker cp "$(DOCKER_CONTAINER)":/dmg/DockerToolbox.pkg . - codesign -v -f -s "Developer ID Application: Docker Inc" DockerToolbox.pkg + mv DockerToolbox.pkg DockerToolboxUnsigned.pkg + productsign --sign "3rd Party Mac Developer Installer: Docker Inc" DockerToolboxUnsigned.pkg DockerToolbox.pkg + rm DockerToolboxUnsigned.pkg clean: rm -f Docker.pkg From 2b9790f0628563a9bd44c644968d3f81da9ccf41 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 13 Jul 2015 16:12:29 -0700 Subject: [PATCH 2/9] Updated download link --- site/layouts/partials/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/layouts/partials/footer.html b/site/layouts/partials/footer.html index d5da59f2e5..05e4c25d9f 100755 --- a/site/layouts/partials/footer.html +++ b/site/layouts/partials/footer.html @@ -51,7 +51,7 @@ // var winDownloadLink = "https://github.com/docker/toolbox/releases/download/v1.7.0/DockerToolbox.exe"; // var macDownloadLink = "https://github.com/docker/toolbox/releases/download/v1.7.0/DockerToolbox.pkg"; var winDownloadLink = "https://slack-files.com/files-pub/T026DFMG3-F07GQP802-259c4579e0/download/dockertoolbox.exe"; - var macDownloadLink = "https://slack-files.com/files-pub/T026DFMG3-F07HKQ0CA-24774abec4/download/dockertoolbox.pkg"; + var macDownloadLink = "https://slack-files.com/files-pub/T026DFMG3-F07J6RSHH-0ffd8ecc6c/download/dockertoolbox.pkg"; var winDocsLink = baseURL + "/windows/started/"; var macDocsLink = baseURL + "/mac/started/"; var winDocsExpLink = baseURL + "/installation/windows/"; From 45540619f58cb00205c83420de1406d9851d4363 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 13 Jul 2015 16:13:13 -0700 Subject: [PATCH 3/9] Create VERSION --- VERSION | 1 + 1 file changed, 1 insertion(+) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 0000000000..bd8bf882d0 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.7.0 From 65d6b97b82d07c426c4155008463109c16b2181a Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 13 Jul 2015 16:25:10 -0700 Subject: [PATCH 4/9] 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 efd6e4dfa839a8d57f4ab2d596191ca10a6033a6 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Mon, 13 Jul 2015 16:53:52 -0700 Subject: [PATCH 5/9] Adding Kitematic to the install info. - Adding KM --- osx/mpkg/Resources/en.lproj/Welcome.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/osx/mpkg/Resources/en.lproj/Welcome.html b/osx/mpkg/Resources/en.lproj/Welcome.html index 8e5c585dcb..e86b5a3923 100644 --- a/osx/mpkg/Resources/en.lproj/Welcome.html +++ b/osx/mpkg/Resources/en.lproj/Welcome.html @@ -8,16 +8,17 @@

This installer guides you through an installation of - Docker Toolbox for Mac OS X v%INSTALLER_VERSION%. + Docker Toolbox for Mac OS X v%INSTALLER_VERSION%.

The Docker Toolbox installer includes the following:

    -
  • the Docker Engine docker binary -
  • the Docker Machine docker-machine binary -
  • the Docker Compose docker-compose binary -
  • a shell preconfigured as a Docker command line environment +
  • Docker Engine docker binary
    • +
  • Docker Machine docker-machine binary
    • +
  • Docker Compose docker-compose binary
    • +
  • Kitematic - Desktop GUI for Docker
    • +
  • a shell preconfigured as a Docker command line environment

@@ -25,7 +26,7 @@

- To continue, click Continue. + To continue, click Continue.

From 0bec920046ada379d6c288ebb2b088a276d326e1 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 13 Jul 2015 17:29:35 -0700 Subject: [PATCH 6/9] set -e on windows --- windows/start.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/windows/start.sh b/windows/start.sh index 14026ae83f..de40a7d84d 100644 --- a/windows/start.sh +++ b/windows/start.sh @@ -1,4 +1,7 @@ #!/bin/bash + +set -e + ISO=$HOME/.docker/machine/cache/boot2docker.iso VM=dev DOCKER_MACHINE=./docker-machine.exe @@ -9,10 +12,10 @@ if [ ! -f $ISO ]; then cp ./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 + $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM else echo "Machine $VM already exists." fi @@ -26,8 +29,8 @@ echo "Setting environment variables for machine $VM..." eval "$(./docker-machine.exe env $VM 2>/dev/null | sed 's,\\,\\\\,g')" cd -clear +clear cat << EOF From 9c4538725646c9450da73ba50d0c0bb502c4243b Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 00:10:36 -0700 Subject: [PATCH 7/9] 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 ecmca1b3Aumf>Vovd7Q{Ep;Y}J$X`7{A%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 Date: Tue, 14 Jul 2015 00:17:12 -0700 Subject: [PATCH 8/9] 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 @@

Docker Engine

-

Creates and runs Docker containers.

+

Create and runs Docker containers.

Docker Machine

-

Provisions Docker to local or remote machines.

+

Provision Docker-ready local or remote machines.

Docker Compose

-

Define multi-container applications. (Mac OS X only)

+

Define multi-container applications. (OS X only)

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 Date: Tue, 14 Jul 2015 00:38:29 -0700 Subject: [PATCH 9/9] 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 @@ docker_title - +