docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

t pMerge branch 'master' of github.com:docker/toolbox

This commit is contained in:
Jeffrey Morgan 2015-07-14 12:03:35 -07:00
parent f39bcde25b a9a1a50124
commit 24c1d3084e
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
site/layouts/index.html
View File

@ -51,13 +51,6 @@
<p>Define multi-container applications. (OS X only)</p> <p>Define multi-container applications. (OS X only)</p>
</div> </div>
</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="item">
<div class="info"> <div class="info">
<img src="{{.Site.BaseURL}}/images/kitematic.png"> <img src="{{.Site.BaseURL}}/images/kitematic.png">
@ -92,7 +85,7 @@
<ol> <ol>
<li>Open a terminal or the Docker CLI on your system.</li> <li>Open a terminal or the Docker CLI on your system.</li>
<li>Type the following command.<br> <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>
<li>Use the <code>docker-machine</code> command to interact with the migrated VM. </li> <li>Use the <code>docker-machine</code> command to interact with the migrated VM. </li>
</ol> </ol>

10
site/static/css/main.css
View File

@ -290,13 +290,15 @@ table {
-ms-flex-flow: row wrap; -ms-flex-flow: row wrap;
flex-flow: row wrap; flex-flow: row wrap;
} }
.content .items .item {
text-align: center;
}
.content .items .item img { .content .items .item img {
width: 100px; width: 100px;
height: auto; height: auto;
} }
.content .items .item .info { .content .items .item .info {
text-align: center; padding-right: 1.5rem;
padding-right: 1rem;
} }
.content .documentation { .content .documentation {
text-align: center; text-align: center;
@ -349,8 +351,8 @@ table {
} }
@media screen and (min-width: 500px) { @media screen and (min-width: 500px) {
.items .item { .items .item {
max-width: 20%; max-width: 25%;
min-width: 140px; min-width: 160px;
} }
} }
.footer { .footer {

8
site/static/less/layout.less
View File

@ -142,13 +142,13 @@
.flex-display(); .flex-display();
.flex-flow(row wrap); .flex-flow(row wrap);
.item { .item {
text-align: center;
img { img {
width: 100px; width: 100px;
height: auto; height: auto;
} }
.info { .info {
text-align: center; padding-right: 1.5rem;
padding-right: 1rem;
} }
} }
} }
@ -213,8 +213,8 @@
@media screen and (min-width: 500px) { @media screen and (min-width: 500px) {
.items { .items {
.item { .item {
max-width: 20%; max-width: 25%;
min-width: 140px; min-width: 160px;
} }
} }
} }

14
windows/start.sh
View File

@ -6,6 +6,10 @@ ISO=$HOME/.docker/machine/cache/boot2docker.iso
VM=dev VM=dev
DOCKER_MACHINE=./docker-machine.exe DOCKER_MACHINE=./docker-machine.exe
BLUE='\033[1;34m'
GREEN='\033[0;32m'
NC='\033[0m'
mkdir -p ~/.docker/machine/cache mkdir -p ~/.docker/machine/cache
if [ ! -f $ISO ]; then if [ ! -f $ISO ]; then
mkdir -p "$(dirname "$ISO")" mkdir -p "$(dirname "$ISO")"
@ -26,9 +30,7 @@ $DOCKER_MACHINE start dev
echo "Setting environment variables for machine $VM..." echo "Setting environment variables for machine $VM..."
./docker-machine.exe env $VM | sed 's,\\,\\\\,g' # eval swallows single backslashes in windows style path ./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')" eval "$($DOCKER_MACHINE env $VM 2>/dev/null | sed 's,\\,\\\\,g')"
cd
clear clear
cat << EOF cat << EOF
@ -44,7 +46,7 @@ cat << EOF
\____\_______/ \____\_______/
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 "For help getting started, check out the docs at https://docs.docker.com"
echo echo
cd
exec "$BASH" --login -i