mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
This commit is contained in:
parent
b5ccfca565
commit
fa9299f4c0
21 changed files with 29 additions and 29 deletions
|
@ -60,7 +60,7 @@ You might need to create the bus before you can add the ISO.
|
||||||
## 5. Add the new VDI image
|
## 5. Add the new VDI image
|
||||||
|
|
||||||
In the settings for the Boot2Docker image in VirtualBox, remove the VMDK image
|
In the settings for the Boot2Docker image in VirtualBox, remove the VMDK image
|
||||||
from the SATA contoller and add the VDI image.
|
from the SATA controller and add the VDI image.
|
||||||
|
|
||||||
<img src="/articles/b2d_volume_images/add_volume.png">
|
<img src="/articles/b2d_volume_images/add_volume.png">
|
||||||
|
|
||||||
|
|
|
@ -576,7 +576,7 @@ As soon as the router wants to send an IPv6 packet to the first container it
|
||||||
will transmit a neighbor solicitation request, asking, who has
|
will transmit a neighbor solicitation request, asking, who has
|
||||||
`2001:db8::c009`? But it will get no answer because noone on this subnet has
|
`2001:db8::c009`? But it will get no answer because noone on this subnet has
|
||||||
this address. The container with this address is hidden behind the Docker host.
|
this address. The container with this address is hidden behind the Docker host.
|
||||||
The Docker host has to listen to neighbor solication requests for the container
|
The Docker host has to listen to neighbor solicitation requests for the container
|
||||||
address and send a response that itself is the device that is responsible for
|
address and send a response that itself is the device that is responsible for
|
||||||
the address. This is done by a Kernel feature called `NDP Proxy`. You can
|
the address. This is done by a Kernel feature called `NDP Proxy`. You can
|
||||||
enable it by executing
|
enable it by executing
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
page_title: Using Puppet
|
page_title: Using Puppet
|
||||||
page_description: Installating and using Puppet
|
page_description: Installing and using Puppet
|
||||||
page_keywords: puppet, installation, usage, docker, documentation
|
page_keywords: puppet, installation, usage, docker, documentation
|
||||||
|
|
||||||
# Using Puppet
|
# Using Puppet
|
||||||
|
|
|
@ -249,7 +249,7 @@ may still be utilized by Docker containers on supported kernels,
|
||||||
by directly using the clone syscall, or utilizing the 'unshare'
|
by directly using the clone syscall, or utilizing the 'unshare'
|
||||||
utility. Using this, some users may find it possible to drop
|
utility. Using this, some users may find it possible to drop
|
||||||
more capabilities from their process as user namespaces provide
|
more capabilities from their process as user namespaces provide
|
||||||
an artifical capabilities set. Likewise, however, this artifical
|
an artificial capabilities set. Likewise, however, this artificial
|
||||||
capabilities set may require use of 'capsh' to restrict the
|
capabilities set may require use of 'capsh' to restrict the
|
||||||
user-namespace capabilities set when using 'unshare'.
|
user-namespace capabilities set when using 'unshare'.
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ Docker is available in **openSUSE 12.3 and later**. Please note that due
|
||||||
to its current limitations Docker is able to run only **64 bit** architecture.
|
to its current limitations Docker is able to run only **64 bit** architecture.
|
||||||
|
|
||||||
Docker is not part of the official repositories of openSUSE 12.3 and
|
Docker is not part of the official repositories of openSUSE 12.3 and
|
||||||
openSUSE 13.1. Hence it is neccessary to add the [Virtualization
|
openSUSE 13.1. Hence it is necessary to add the [Virtualization
|
||||||
repository](https://build.opensuse.org/project/show/Virtualization) from
|
repository](https://build.opensuse.org/project/show/Virtualization) from
|
||||||
[OBS](https://build.opensuse.org/) to install the `docker` package.
|
[OBS](https://build.opensuse.org/) to install the `docker` package.
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@ Always rebase and squash your commits before making a pull request.
|
||||||
|
|
||||||
`git commit -s`
|
`git commit -s`
|
||||||
|
|
||||||
Make sure your message includes <a href="./set-up-git" target="_blank>your signature</a>.
|
Make sure your message includes <a href="./set-up-git" target="_blank>your signature</a>.
|
||||||
|
|
||||||
7. Force push any changes to your fork on GitHub.
|
7. Force push any changes to your fork on GitHub.
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ work on Docker. You need to understand and work with both the "bots" and the
|
||||||
"beings" to review your contribution.
|
"beings" to review your contribution.
|
||||||
|
|
||||||
|
|
||||||
## How we proces your review
|
## How we process your review
|
||||||
|
|
||||||
First to review your pull request is Gordon. Gordon is fast. He checks your
|
First to review your pull request is Gordon. Gordon is fast. He checks your
|
||||||
pull request (PR) for common problems like a missing signature. If Gordon finds a
|
pull request (PR) for common problems like a missing signature. If Gordon finds a
|
||||||
|
|
|
@ -40,7 +40,7 @@ units each have unit tests and then, together, integration tests that test the
|
||||||
interface between the components. The `integration` and `integration-cli`
|
interface between the components. The `integration` and `integration-cli`
|
||||||
directories in the Docker repository contain integration test code.
|
directories in the Docker repository contain integration test code.
|
||||||
|
|
||||||
Testing is its own speciality. If you aren't familiar with testing techniques,
|
Testing is its own specialty. If you aren't familiar with testing techniques,
|
||||||
there is a lot of information available to you on the Web. For now, you should
|
there is a lot of information available to you on the Web. For now, you should
|
||||||
understand that, the Docker maintainers may ask you to write a new test or
|
understand that, the Docker maintainers may ask you to write a new test or
|
||||||
change an existing one.
|
change an existing one.
|
||||||
|
|
|
@ -1047,7 +1047,7 @@ Query Parameters:
|
||||||
Request Headers:
|
Request Headers:
|
||||||
|
|
||||||
- **Content-type** – should be set to `"application/tar"`.
|
- **Content-type** – should be set to `"application/tar"`.
|
||||||
- **X-Registry-Config** – base64-encoded ConfigFile objec
|
- **X-Registry-Config** – base64-encoded ConfigFile object
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
||||||
|
|
|
@ -1053,7 +1053,7 @@ Query Parameters:
|
||||||
Request Headers:
|
Request Headers:
|
||||||
|
|
||||||
- **Content-type** – should be set to `"application/tar"`.
|
- **Content-type** – should be set to `"application/tar"`.
|
||||||
- **X-Registry-Config** – base64-encoded ConfigFile objec
|
- **X-Registry-Config** – base64-encoded ConfigFile object
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
||||||
|
|
|
@ -1115,7 +1115,7 @@ Query Parameters:
|
||||||
Request Headers:
|
Request Headers:
|
||||||
|
|
||||||
- **Content-type** – should be set to `"application/tar"`.
|
- **Content-type** – should be set to `"application/tar"`.
|
||||||
- **X-Registry-Config** – base64-encoded ConfigFile objec
|
- **X-Registry-Config** – base64-encoded ConfigFile object
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
||||||
|
|
|
@ -1104,7 +1104,7 @@ Query Parameters:
|
||||||
Request Headers:
|
Request Headers:
|
||||||
|
|
||||||
- **Content-type** – should be set to `"application/tar"`.
|
- **Content-type** – should be set to `"application/tar"`.
|
||||||
- **X-Registry-Config** – base64-encoded ConfigFile objec
|
- **X-Registry-Config** – base64-encoded ConfigFile object
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
||||||
|
|
|
@ -1114,7 +1114,7 @@ Query Parameters:
|
||||||
Request Headers:
|
Request Headers:
|
||||||
|
|
||||||
- **Content-type** – should be set to `"application/tar"`.
|
- **Content-type** – should be set to `"application/tar"`.
|
||||||
- **X-Registry-Config** – base64-encoded ConfigFile objec
|
- **X-Registry-Config** – base64-encoded ConfigFile object
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
||||||
|
|
|
@ -1261,7 +1261,7 @@ Query Parameters:
|
||||||
Request Headers:
|
Request Headers:
|
||||||
|
|
||||||
- **Content-type** – should be set to `"application/tar"`.
|
- **Content-type** – should be set to `"application/tar"`.
|
||||||
- **X-Registry-Config** – base64-encoded ConfigFile objec
|
- **X-Registry-Config** – base64-encoded ConfigFile object
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
||||||
|
@ -1495,7 +1495,7 @@ Get a tarball containing all images and metadata for the repository specified
|
||||||
by `name`.
|
by `name`.
|
||||||
|
|
||||||
If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
|
If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
|
||||||
(and its parents) are returned. If `name` is an image ID, similarly only tha
|
(and its parents) are returned. If `name` is an image ID, similarly only that
|
||||||
image (and its parents) are returned, but with the exclusion of the
|
image (and its parents) are returned, but with the exclusion of the
|
||||||
'repositories' file in the tarball, as there were no image names referenced.
|
'repositories' file in the tarball, as there were no image names referenced.
|
||||||
|
|
||||||
|
|
|
@ -1262,7 +1262,7 @@ Query Parameters:
|
||||||
Request Headers:
|
Request Headers:
|
||||||
|
|
||||||
- **Content-type** – should be set to `"application/tar"`.
|
- **Content-type** – should be set to `"application/tar"`.
|
||||||
- **X-Registry-Config** – base64-encoded ConfigFile objec
|
- **X-Registry-Config** – base64-encoded ConfigFile object
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
||||||
|
@ -1509,7 +1509,7 @@ Get a tarball containing all images and metadata for the repository specified
|
||||||
by `name`.
|
by `name`.
|
||||||
|
|
||||||
If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
|
If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
|
||||||
(and its parents) are returned. If `name` is an image ID, similarly only tha
|
(and its parents) are returned. If `name` is an image ID, similarly only that
|
||||||
image (and its parents) are returned, but with the exclusion of the
|
image (and its parents) are returned, but with the exclusion of the
|
||||||
'repositories' file in the tarball, as there were no image names referenced.
|
'repositories' file in the tarball, as there were no image names referenced.
|
||||||
|
|
||||||
|
|
|
@ -1140,7 +1140,7 @@ Query Parameters:
|
||||||
Request Headers:
|
Request Headers:
|
||||||
|
|
||||||
- **Content-type** – should be set to `"application/tar"`.
|
- **Content-type** – should be set to `"application/tar"`.
|
||||||
- **X-Registry-Config** – base64-encoded ConfigFile objec
|
- **X-Registry-Config** – base64-encoded ConfigFile object
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
||||||
|
@ -1675,7 +1675,7 @@ Get a tarball containing all images and metadata for the repository specified
|
||||||
by `name`.
|
by `name`.
|
||||||
|
|
||||||
If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
|
If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
|
||||||
(and its parents) are returned. If `name` is an image ID, similarly only tha
|
(and its parents) are returned. If `name` is an image ID, similarly only that
|
||||||
image (and its parents) are returned, but with the exclusion of the
|
image (and its parents) are returned, but with the exclusion of the
|
||||||
'repositories' file in the tarball, as there were no image names referenced.
|
'repositories' file in the tarball, as there were no image names referenced.
|
||||||
|
|
||||||
|
|
|
@ -1250,7 +1250,7 @@ Query Parameters:
|
||||||
Request Headers:
|
Request Headers:
|
||||||
|
|
||||||
- **Content-type** – should be set to `"application/tar"`.
|
- **Content-type** – should be set to `"application/tar"`.
|
||||||
- **X-Registry-Config** – base64-encoded ConfigFile objec
|
- **X-Registry-Config** – base64-encoded ConfigFile object
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
||||||
|
@ -1791,7 +1791,7 @@ Get a tarball containing all images and metadata for the repository specified
|
||||||
by `name`.
|
by `name`.
|
||||||
|
|
||||||
If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
|
If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
|
||||||
(and its parents) are returned. If `name` is an image ID, similarly only tha
|
(and its parents) are returned. If `name` is an image ID, similarly only that
|
||||||
image (and its parents) are returned, but with the exclusion of the
|
image (and its parents) are returned, but with the exclusion of the
|
||||||
'repositories' file in the tarball, as there were no image names referenced.
|
'repositories' file in the tarball, as there were no image names referenced.
|
||||||
|
|
||||||
|
|
|
@ -1253,7 +1253,7 @@ Query Parameters:
|
||||||
Request Headers:
|
Request Headers:
|
||||||
|
|
||||||
- **Content-type** – should be set to `"application/tar"`.
|
- **Content-type** – should be set to `"application/tar"`.
|
||||||
- **X-Registry-Config** – base64-encoded ConfigFile objec
|
- **X-Registry-Config** – base64-encoded ConfigFile object
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
||||||
|
@ -1794,7 +1794,7 @@ Get a tarball containing all images and metadata for the repository specified
|
||||||
by `name`.
|
by `name`.
|
||||||
|
|
||||||
If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
|
If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
|
||||||
(and its parents) are returned. If `name` is an image ID, similarly only tha
|
(and its parents) are returned. If `name` is an image ID, similarly only that
|
||||||
image (and its parents) are returned, but with the exclusion of the
|
image (and its parents) are returned, but with the exclusion of the
|
||||||
'repositories' file in the tarball, as there were no image names referenced.
|
'repositories' file in the tarball, as there were no image names referenced.
|
||||||
|
|
||||||
|
|
|
@ -1052,7 +1052,7 @@ Query Parameters:
|
||||||
Request Headers:
|
Request Headers:
|
||||||
|
|
||||||
- **Content-type** – should be set to `"application/tar"`.
|
- **Content-type** – should be set to `"application/tar"`.
|
||||||
- **X-Registry-Config** – base64-encoded ConfigFile objec
|
- **X-Registry-Config** – base64-encoded ConfigFile object
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
||||||
|
|
|
@ -128,7 +128,7 @@ modifiers as specified below:
|
||||||
|
|
||||||
* `${variable:-word}` indicates that if `variable` is set then the result
|
* `${variable:-word}` indicates that if `variable` is set then the result
|
||||||
will be that value. If `variable` is not set then `word` will be the result.
|
will be that value. If `variable` is not set then `word` will be the result.
|
||||||
* `${variable:+word}` indiates that if `variable` is set then `word` will be
|
* `${variable:+word}` indicates that if `variable` is set then `word` will be
|
||||||
the result, otherwise the result is the empty string.
|
the result, otherwise the result is the empty string.
|
||||||
|
|
||||||
In all cases, `word` can be any string, including additional environment
|
In all cases, `word` can be any string, including additional environment
|
||||||
|
@ -158,7 +158,7 @@ The instructions that handle environment variables in the `Dockerfile` are:
|
||||||
`ONBUILD` instructions are **NOT** supported for environment replacement, even
|
`ONBUILD` instructions are **NOT** supported for environment replacement, even
|
||||||
the instructions above.
|
the instructions above.
|
||||||
|
|
||||||
Environment variable subtitution will use the same value for each variable
|
Environment variable substitution will use the same value for each variable
|
||||||
throughout the entire command. In other words, in this example:
|
throughout the entire command. In other words, in this example:
|
||||||
|
|
||||||
ENV abc=hello
|
ENV abc=hello
|
||||||
|
@ -299,7 +299,7 @@ The cache for `RUN` instructions can be invalidated by `ADD` instructions. See
|
||||||
the layers with `dirperm1` option. More details on `dirperm1` option can be
|
the layers with `dirperm1` option. More details on `dirperm1` option can be
|
||||||
found at [`aufs` man page](http://aufs.sourceforge.net/aufs3/man.html)
|
found at [`aufs` man page](http://aufs.sourceforge.net/aufs3/man.html)
|
||||||
|
|
||||||
If your system doesnt have support for `dirperm1`, the issue describes a workaround.
|
If your system doesn't have support for `dirperm1`, the issue describes a workaround.
|
||||||
|
|
||||||
## CMD
|
## CMD
|
||||||
|
|
||||||
|
@ -368,7 +368,7 @@ default specified in `CMD`.
|
||||||
|
|
||||||
The `LABEL` instruction adds metadata to an image. A `LABEL` is a
|
The `LABEL` instruction adds metadata to an image. A `LABEL` is a
|
||||||
key-value pair. To include spaces within a `LABEL` value, use quotes and
|
key-value pair. To include spaces within a `LABEL` value, use quotes and
|
||||||
blackslashes as you would in command-line parsing.
|
backslashes as you would in command-line parsing.
|
||||||
|
|
||||||
LABEL "com.example.vendor"="ACME Incorporated"
|
LABEL "com.example.vendor"="ACME Incorporated"
|
||||||
|
|
||||||
|
|
|
@ -380,7 +380,7 @@ This means the daemon will wait for 100 ms, then 200 ms, 400, 800, 1600,
|
||||||
and so on until either the `on-failure` limit is hit, or when you `docker stop`
|
and so on until either the `on-failure` limit is hit, or when you `docker stop`
|
||||||
or `docker rm -f` the container.
|
or `docker rm -f` the container.
|
||||||
|
|
||||||
If a container is succesfully restarted (the container is started and runs
|
If a container is successfully restarted (the container is started and runs
|
||||||
for at least 10 seconds), the delay is reset to its default value of 100 ms.
|
for at least 10 seconds), the delay is reset to its default value of 100 ms.
|
||||||
|
|
||||||
You can specify the maximum amount of times Docker will try to restart the
|
You can specify the maximum amount of times Docker will try to restart the
|
||||||
|
|
Loading…
Add table
Reference in a new issue