Remove references to boot2docker replace with docker-machine

- 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-27 18:25:50 -07:00
parent 4ed3e3a5b2
commit 1825e06944
11 changed files with 36 additions and 97 deletions
+3 -4
View File
@@ -12,12 +12,11 @@ parent = "smn_remoteapi"
- By default the Docker daemon listens on `unix:///var/run/docker.sock`
and the client must have `root` access to interact with the daemon.
- If the Docker daemon is set to use an encrypted TCP socket (`--tls`,
or `--tlsverify`) as with Boot2Docker 1.3.0, then you need to add extra
- If you are using `docker-machine`, the Docker daemon is on a virtual host that uses an encrypted TCP socket. In this situation, you need to add extra
parameters to `curl` or `wget` when making test API requests:
`curl --insecure --cert ~/.docker/cert.pem --key ~/.docker/key.pem https://boot2docker:2376/images/json`
`curl --insecure --cert ~/.docker/cert.pem --key ~/.docker/key.pem https://YOUR_VM_IP:2376/images/json`
or
`wget --no-check-certificate --certificate=$DOCKER_CERT_PATH/cert.pem --private-key=$DOCKER_CERT_PATH/key.pem https://boot2docker:2376/images/json -O - -q`
`wget --no-check-certificate --certificate=$DOCKER_CERT_PATH/cert.pem --private-key=$DOCKER_CERT_PATH/key.pem https://your_vm_ip:2376/images/json -O - -q`
- If a group named `docker` exists on your system, docker will apply
ownership of the socket to the group.
- The API tends to be REST, but for some complex commands, like attach
+3 -3
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 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
for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be
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
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
+6 -5
View File
@@ -22,11 +22,7 @@ Docker supports as a storage backend. It implements the
## boot2docker
[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)
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.
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.
## 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*
## Toolbox
Docker Toolbox is the installer for Mac and Windows users.
## Union file system
Union file systems, or UnionFS, are file systems that operate by creating layers, making them