diff --git a/VERSION b/VERSION new file mode 100644 index 0000000000..bd8bf882d0 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.7.0 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 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 - + 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 fbc1360de5..14203852c8 100644 Binary files a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt and b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt differ 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..904bdd166a --- a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh +++ b/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,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 + 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.

diff --git a/site/layouts/index.html b/site/layouts/index.html index f8d3a0f727..41c7cbbc88 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/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/"; diff --git a/site/static/css/main.css b/site/static/css/main.css index 018eed2698..ee343067ef 100755 --- a/site/static/css/main.css +++ b/site/static/css/main.css @@ -301,6 +301,7 @@ table { padding-right: 1.5rem; } .content .documentation { + text-align: center; padding: 2rem 0; } .content .documentation h3 { @@ -312,8 +313,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 65acfca9be..f2f061cb1b 100755 --- a/site/static/less/layout.less +++ b/site/static/less/layout.less @@ -153,6 +153,7 @@ } } .documentation { + text-align: center; padding: 2rem 0; h3 { color: fade(white, 70%); @@ -162,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%); 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