mirror of https://github.com/docker/cli.git
Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
This commit is contained in:
parent
72f4a6bc1c
commit
fcf01194a9
|
@ -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…
Reference in New Issue