diff options
Diffstat (limited to 'docs/reference')
| -rw-r--r-- | docs/reference/builder.md | 11 | ||||
| -rw-r--r-- | docs/reference/commandline/attach.md | 2 | ||||
| -rw-r--r-- | docs/reference/commandline/build.md | 3 | ||||
| -rw-r--r-- | docs/reference/commandline/cp.md | 12 | ||||
| -rw-r--r-- | docs/reference/commandline/pull.md | 9 | ||||
| -rw-r--r-- | docs/reference/commandline/run.md | 12 | ||||
| -rw-r--r-- | docs/reference/run.md | 9 |
7 files changed, 43 insertions, 15 deletions
diff --git a/docs/reference/builder.md b/docs/reference/builder.md index 9a2f42ea8b..d2d831a821 100644 --- a/docs/reference/builder.md +++ b/docs/reference/builder.md @@ -361,7 +361,16 @@ RUN /bin/bash -c 'source $HOME/.bashrc ; echo $HOME' > This means that normal shell processing does not happen. For example, > `RUN [ "echo", "$HOME" ]` will not do variable substitution on `$HOME`. > If you want shell processing then either use the *shell* form or execute -> a shell directly, for example: `RUN [ "sh", "-c", "echo", "$HOME" ]`. +> a shell directly, for example: `RUN [ "sh", "-c", "echo $HOME" ]`. +> +> **Note**: +> In the *JSON* form, it is necessary to escape backslashes. This is +> particularly relevant on Windows where the backslash is the path seperator. +> The following line would otherwise be treated as *shell* form due to not +> being valid JSON, and fail in an unexpected way: +> `RUN ["c:\windows\system32\tasklist.exe"]` +> The correct syntax for this example is: +> `RUN ["c:\\windows\\system32\\tasklist.exe"]` The cache for `RUN` instructions isn't invalidated automatically during the next build. The cache for an instruction like diff --git a/docs/reference/commandline/attach.md b/docs/reference/commandline/attach.md index b28b6fc263..799fe1d176 100644 --- a/docs/reference/commandline/attach.md +++ b/docs/reference/commandline/attach.md @@ -28,7 +28,7 @@ detached process. To stop a container, use `CTRL-c`. This key sequence sends `SIGKILL` to the container. If `--sig-proxy` is true (the default),`CTRL-c` sends a `SIGINT` to the container. You can detach from a container and leave it running using the -using `CTRL-p CTRL-q` key sequence. + `CTRL-p CTRL-q` key sequence. > **Note:** > A process running as PID 1 inside a container is treated specially by diff --git a/docs/reference/commandline/build.md b/docs/reference/commandline/build.md index 4530f77bb1..f0f30a0ced 100644 --- a/docs/reference/commandline/build.md +++ b/docs/reference/commandline/build.md @@ -298,6 +298,9 @@ accessed like regular environment variables in the `RUN` instruction of the Dockerfile. Also, these values don't persist in the intermediate or final images like `ENV` values do. +Using this flag will not alter the output you see when the `ARG` lines from the +Dockerfile are echoed during the build process. + For detailed information on using `ARG` and `ENV` instructions, see the [Dockerfile reference](../builder.md). diff --git a/docs/reference/commandline/cp.md b/docs/reference/commandline/cp.md index 841aeb36e0..8afabc95bc 100644 --- a/docs/reference/commandline/cp.md +++ b/docs/reference/commandline/cp.md @@ -81,7 +81,17 @@ you must be explicit with a relative or absolute path, for example: `/path/to/file:name.txt` or `./file:name.txt` It is not possible to copy certain system files such as resources under -`/proc`, `/sys`, `/dev`, and mounts created by the user in the container. +`/proc`, `/sys`, `/dev`, [tmpfs](run.md#mount-tmpfs-tmpfs), and mounts created by +the user in the container. However, you can still copy such files by manually +running `tar` in `docker exec`. For example (consider `SRC_PATH` and `DEST_PATH` +are directories): + + $ docker exec foo tar Ccf $(dirname SRC_PATH) - $(basename SRC_PATH) | tar Cxf DEST_PATH - + +or + + $ tar Ccf $(dirname SRC_PATH) - $(basename SRC_PATH) | docker exec -i foo tar Cxf DEST_PATH - + Using `-` as the `SRC_PATH` streams the contents of `STDIN` as a tar archive. The command extracts the content of the tar to the `DEST_PATH` in container's diff --git a/docs/reference/commandline/pull.md b/docs/reference/commandline/pull.md index 01ec88e8a6..0231422918 100644 --- a/docs/reference/commandline/pull.md +++ b/docs/reference/commandline/pull.md @@ -27,6 +27,15 @@ can `pull` and try without needing to define and configure your own. To download a particular image, or set of images (i.e., a repository), use `docker pull`. +## Proxy configuration + +If you are behind a HTTP proxy server, for example in corporate settings, +before open a connect to registry, you may need to configure the Docker +daemon's proxy settings, using the `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY` +environment variables. To set these environment variables on a host using +`systemd`, refer to the [control and configure Docker with systemd](../../admin/systemd.md#http-proxy) +for variables configuration. + ## Examples ### Pull an image from Docker Hub diff --git a/docs/reference/commandline/run.md b/docs/reference/commandline/run.md index 97553a67dc..544aa37240 100644 --- a/docs/reference/commandline/run.md +++ b/docs/reference/commandline/run.md @@ -227,12 +227,12 @@ system's interfaces. This sets simple (non-array) environmental variables in the container. For illustration all three flags are shown here. Where `-e`, `--env` take an environment variable and -value, or if no `=` is provided, then that variable's current value is passed -through (i.e. `$MYVAR1` from the host is set to `$MYVAR1` in the container). -When no `=` is provided and that variable is not defined in the client's -environment then that variable will be removed from the container's list of -environment variables. -All three flags, `-e`, `--env` and `--env-file` can be repeated. +value, or if no `=` is provided, then that variable's current value, set via +`export`, is passed through (i.e. `$MYVAR1` from the host is set to `$MYVAR1` +in the container). When no `=` is provided and that variable is not defined +in the client's environment then that variable will be removed from the +container's list of environment variables. All three flags, `-e`, `--env` and +`--env-file` can be repeated. Regardless of the order of these three flags, the `--env-file` are processed first, and then `-e`, `--env` flags. This way, the `-e` or `--env` will diff --git a/docs/reference/run.md b/docs/reference/run.md index 942bba948f..447ae12cda 100644 --- a/docs/reference/run.md +++ b/docs/reference/run.md @@ -612,15 +612,12 @@ with the same logic -- if the original volume was specified with a name it will You can override the default labeling scheme for each container by specifying -the `--security-opt` flag. For example, you can specify the MCS/MLS level, a -requirement for MLS systems. Specifying the level in the following command +the `--security-opt` flag. Specifying the level in the following command allows you to share the same content between containers. $ docker run --security-opt label=level:s0:c100,c200 -it fedora bash -An MLS example might be: - - $ docker run --security-opt label=level:TopSecret -it rhel7 bash +> **Note**: Automatic translation of MLS labels is not currently supported. To disable the security labeling for this container versus running with the `--permissive` flag, use the following command: @@ -1433,7 +1430,7 @@ The `host-src` can either be an absolute path or a `name` value. If you supply an absolute path for the `host-dir`, Docker bind-mounts to the path you specify. If you supply a `name`, Docker creates a named volume by that `name`. -A `name` value must start with start with an alphanumeric character, +A `name` value must start with an alphanumeric character, followed by `a-z0-9`, `_` (underscore), `.` (period) or `-` (hyphen). An absolute path starts with a `/` (forward slash). |