Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 3467817

Browse files
sudo-bmitchthaJeztah
authored andcommitted
Adjusting glossary reference and clarrifying the start of a Dockerfile
Signed-off-by: Brandon Mitchell <git@bmitch.net> (cherry picked from commit 937ce69b4251d355db64eb88715ced76ed04b157) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: c050ae7fb168a9dd5cb8a65a72cc7d2ec7993cda Component: cli
1 parent 1b850e1 commit 3467817

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

components/cli/docs/reference/builder.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,12 @@ be UPPERCASE to distinguish them from arguments more easily.
157157

158158

159159
Docker runs instructions in a `Dockerfile` in order. A `Dockerfile` **must
160-
start with a \`FROM\` instruction**. The `FROM` instruction specifies the [*Base
161-
Image*](glossary.md#base-image) from which you are building. `FROM` may only be
162-
preceded by one or more `ARG` instructions, which declare arguments that are used
163-
in `FROM` lines in the `Dockerfile`.
160+
begin with a \`FROM\` instruction**. This may be after [parser
161+
directives](#parser-directives), [comments](#format), and globally scoped
162+
[ARGs](#arg). The `FROM` instruction specifies the [*Parent
163+
Image*](glossary.md#parent-image) from which you are building. `FROM`
164+
may only be preceded by one or more `ARG` instructions, which declare arguments
165+
that are used in `FROM` lines in the `Dockerfile`.
164166

165167
Docker treats lines that *begin* with `#` as a comment, unless the line is
166168
a valid [parser directive](#parser-directives). A `#` marker anywhere

0 commit comments

Comments
 (0)