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

Merge remote-tracking branch 'origin/master' 

Conflicts:
	site/static/css/main.css
	site/static/less/layout.less
This commit is contained in:
Sean Li 2015-07-14 11:48:29 -07:00
parent 75ee11b1c9 b16944d30e
commit 8f8e385daf
11 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION Normal file
View File

@ -0,0 +1 @@
1.7.0

4
osx/Makefile
View File

@ -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

2
osx/mpkg/Distribution
View File

@ -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"/>

BIN
osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt
View File

Binary file not shown.

25
osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh Normal file → Executable file
View File

@ -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

13
osx/mpkg/Resources/en.lproj/Welcome.html
View File

@ -8,16 +8,17 @@
<p>
This installer guides you through an installation of
<b>Docker Toolbox for Mac OS X v%INSTALLER_VERSION%</b>.
<strong>Docker Toolbox for Mac OS X v%INSTALLER_VERSION%</strong>.
</p>
<p>
The Docker Toolbox installer includes the following:
</p>
<ul>
<li>the Docker Engine <code>docker</code> binary
<li>the Docker Machine <code>docker-machine</code> binary
<li>the Docker Compose <code>docker-compose</code> binary
<li>a shell preconfigured as a Docker command line environment
<li>Docker Engine <code>docker</code> binary </li>
<li>Docker Machine <code>docker-machine</code> binary </li>
<li>Docker Compose <code>docker-compose</code> binary </li>
<li>Kitematic - Desktop GUI for Docker </li>
<li>a shell preconfigured as a Docker command line environment </li>
</ul>
<br/>
<p>
@ -25,7 +26,7 @@
</p>
<p>
To continue, click <b>Continue</b>.
To continue, click <strong>Continue</strong>.
</p>
</body>
</html>

6
site/layouts/index.html
View File

@ -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">

2
site/layouts/partials/footer.html
View File

@ -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/";

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

@ -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);

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

@ -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%);

9
windows/start.sh
View File

@ -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