1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove references to boot2docker replace with docker-machine

Browse Source 
- boot2docker is deprecated in the 1.8.0
- docker-machine replaces it
- this fixes #14563
- Updating with thaJetzah comments

Signed-off-by: Mary Anthony <mary@docker.com>
This commit is contained in:
Mary Anthony 2015-07-17 13:05:45 -07:00 committed by Tibor Vass
parent 2d2b607e1c
commit b775ca48e0
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/reference/commandline/daemon.md
View File

@ -477,15 +477,15 @@ please check the [run](run.md) reference.
IP masquerading uses address translation to allow containers without a public IP masquerading uses address translation to allow containers without a public
IP to talk to other machines on the Internet. This may interfere with some IP to talk to other machines on the Internet. This may interfere with some
network topologies and can be disabled with --ip-masq=false. network topologies and can be disabled with `--ip-masq=false`.
Docker supports softlinks for the Docker data directory (`/var/lib/docker`) and Docker supports softlinks for the Docker data directory (`/var/lib/docker`) and
for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be
set like this: set like this:
DOCKER_TMPDIR=/mnt/disk2/tmp /usr/local/bin/docker daemon -D -g /var/lib/docker -H unix:// > /var/lib/boot2docker/docker.log 2>&1 DOCKER_TMPDIR=/mnt/disk2/tmp /usr/local/bin/docker daemon -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1
# or # or
export DOCKER_TMPDIR=/mnt/disk2/tmp export DOCKER_TMPDIR=/mnt/disk2/tmp
/usr/local/bin/docker daemon -D -g /var/lib/docker -H unix:// > /var/lib/boot2docker/docker.log 2>&1 /usr/local/bin/docker daemon -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1

11
docs/reference/glossary.md
View File

@ -22,11 +22,7 @@ Docker supports as a storage backend. It implements the
## boot2docker ## boot2docker
[boot2docker](http://boot2docker.io/) is a lightweight Linux distribution made [boot2docker](http://boot2docker.io/) is a lightweight Linux distribution made
specifically to run Docker containers. It is a common choice for a [VM](#virtual-machine) specifically to run Docker containers. The boot2docker management tool for Mac and Windows was deprecated and replaced by [`docker-machine`](#machine) which you can install with the Docker Toolbox.
to run Docker on Windows and Mac OS X.
boot2docker can also refer to the boot2docker management tool on Windows and
Mac OS X which manages the boot2docker VM.
## btrfs ## btrfs
@ -188,6 +184,11 @@ tags are how various images in a repository are distinguished from each other.
*Note : This label is not related to the key=value labels set for docker daemon* *Note : This label is not related to the key=value labels set for docker daemon*
## Toolbox
Docker Toolbox is the installer for Mac and Windows users.
## Union file system ## Union file system
Union file systems, or UnionFS, are file systems that operate by creating layers, making them Union file systems, or UnionFS, are file systems that operate by creating layers, making them