소스 검색

Minor edits to Environment variables section

* Clarify the list of supported instructions.
* Clarify behavior of ONBUILD, based on comments by @SvenDowideit, @theJeztah in PR #14735.
* Reorder list of instructions in alphabetical order.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Charles Chan 10 년 전
부모
커밋
42263dafcf
1개의 변경된 파일12개의 추가작업 그리고 6개의 파일을 삭제
  1. 12 6
      docs/reference/builder.md

+ 12 - 6
docs/reference/builder.md

@@ -152,18 +152,24 @@ Example (parsed representation is displayed after the `#`):
     ADD . $foo       # ADD . /bar
     COPY \$foo /quux # COPY $foo /quux
 
-The instructions that handle environment variables in the `Dockerfile` are:
+Environment variables are supported by the following list of instructions in 
+the `Dockerfile`:
 
-* `ENV`
 * `ADD`
 * `COPY`
-* `WORKDIR`
+* `ENV`
 * `EXPOSE`
-* `VOLUME`
 * `USER`
+* `WORKDIR`
+* `VOLUME`
+
+as well as:
 
-`ONBUILD` instructions are **NOT** supported for environment replacement, even
-the instructions above.
+* `ONBUILD` (when combined with one of the supported instructions above)
+
+> **Note**:
+> prior to 1.4, `ONBUILD` instructions did **NOT** support environment 
+> variable, even when combined with any of the instructions listed above.
 
 Environment variable substitution will use the same value for each variable
 throughout the entire command.  In other words, in this example: