From 75ee11b1c9ed5b7f95f62be21506e52cc1708c0b Mon Sep 17 00:00:00 2001 From: Sean Li Date: Tue, 14 Jul 2015 11:44:32 -0700 Subject: [PATCH 1/4] 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 @@

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

-
-
- -

Docker Swarm

-

Host clustering and container scheduling.

-
-
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 2940c98332a8ec569f7aac4257b17579f1be1557 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Tue, 14 Jul 2015 11:50:10 -0700 Subject: [PATCH 2/4] 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 @@
  1. Open a terminal or the Docker CLI on your system.
  2. Type the following command.
    -
    docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm
    +
    docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm dev
  3. Use the docker-machine command to interact with the migrated VM.
From 6f9751d61820981f08ca73ca81f3ccc9a1b6176e Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 12:00:51 -0700 Subject: [PATCH 3/4] Fix windows start script --- windows/start.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/windows/start.sh b/windows/start.sh index de40a7d84d..eb68109459 100644 --- a/windows/start.sh +++ b/windows/start.sh @@ -6,6 +6,10 @@ ISO=$HOME/.docker/machine/cache/boot2docker.iso VM=dev DOCKER_MACHINE=./docker-machine.exe +BLUE='\033[1;34m' +GREEN='\033[0;32m' +NC='\033[0m' + mkdir -p ~/.docker/machine/cache if [ ! -f $ISO ]; then mkdir -p "$(dirname "$ISO")" @@ -26,9 +30,7 @@ $DOCKER_MACHINE start dev echo "Setting environment variables for machine $VM..." ./docker-machine.exe env $VM | sed 's,\\,\\\\,g' # eval swallows single backslashes in windows style path -eval "$(./docker-machine.exe env $VM 2>/dev/null | sed 's,\\,\\\\,g')" - -cd +eval "$($DOCKER_MACHINE env $VM 2>/dev/null | sed 's,\\,\\\\,g')" clear cat << EOF @@ -44,7 +46,6 @@ 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 $VM)${NC}" echo - -exec "$BASH" --login -i +cd From e6ee48a88feeb15200c5f21fd98c7babd2fc3eba Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 12:02:30 -0700 Subject: [PATCH 4/4] Add docs --- windows/start.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/start.sh b/windows/start.sh index eb68109459..0c93f1ae89 100644 --- a/windows/start.sh +++ b/windows/start.sh @@ -47,5 +47,6 @@ cat << EOF EOF echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}dev${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip $VM)${NC}" +echo "For help getting started, check out the docs at https://docs.docker.com" echo cd