centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 14:28:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1477 from nathanleclaire/lil_doc_fixups

Browse Source 
Fix some docs issues
This commit is contained in:
Evan Hazlett
2015-07-06 20:54:52 -04:00
parent 0f36a14a67 eabe07294d
commit 306aed635d
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
docs/index.md
View File

@@ -548,23 +548,23 @@ The following is an example usage:
$ docker-machine create -d virtualbox \
--engine-label foo=bar \
--engine-label spam=eggs \
--engine-storage-driver devicemapper \
--engine-storage-driver overlay \
--engine-insecure-registry registry.myco.com \
foobarmachine
```
This will create a virtual machine running locally in Virtualbox which uses the
`devicemapper` storage backend, has the key-value pairs `foo=bar` and
`spam=eggs` as labels on the engine, and allows pushing / pulling from the
insecure registry located at `registry.myco.com`. You can verify much of this
by inspecting the output of `docker info`:
`overlay` storage backend, has the key-value pairs `foo=bar` and `spam=eggs` as
labels on the engine, and allows pushing / pulling from the insecure registry
located at `registry.myco.com`. You can verify much of this by inspecting the
output of `docker info`:
```
$ eval $(docker-machine env foobarmachine)
$ docker version
Containers: 0
Images: 0
Storage Driver: devicemapper
Storage Driver: overlay
...
Name: foobarmachine
...
@@ -1007,7 +1007,8 @@ $ cat foo.txt
A file created remotely!
```
Files are copied recursively by default (`scp`'s `-r` flag).
Just like how `scp` has a `-r` flag for copying files recursively,
`docker-machine` has a `-r` flag for this feature.
In the case of transferring files from machine to machine, they go through the
local host's filesystem first (using `scp`'s `-3` flag).
@@ -1037,11 +1038,14 @@ dev * virtualbox Stopped
#### upgrade
Upgrade a machine to the latest version of Docker. If the machine uses Ubuntu
as the underlying operating system, it will upgrade the package `lxc-docker`
(our recommended install method). If the machine uses boot2docker, this command
will download the latest boot2docker ISO and replace the machine's existing ISO
with the latest.
Upgrade a machine to the latest version of Docker. How this upgrade happens
depends on the underlying distribution used on the created instance.
For example, if the machine uses Ubuntu as the underlying operating system, it
will run a command similar to `sudo apt-get upgrade lxc-docker`, because Machine
expects Ubuntu machines it manages to use this package. As another example, if
the machine uses boot2docker for its OS, this command will download the latest
boot2docker ISO and replace the machine's existing ISO with the latest.
```
$ docker-machine upgrade dev