Browse Source

Merge pull request #7460 from suzaku/fix_docs

Make it clear that JSON array format should be used if CMD is used as default arguments
Sven Dowideit 11 years ago
parent
commit
0ca010695c
1 changed files with 5 additions and 0 deletions
  1. 5 0
      docs/sources/reference/builder.md

+ 5 - 0
docs/sources/reference/builder.md

@@ -196,6 +196,11 @@ container.** These defaults can include an executable, or they can omit
 the executable, in which case you must specify an `ENTRYPOINT`
 instruction as well.
 
+> **Note**:
+> If `CMD` is used to provide default arguments for the `ENTRYPOINT` 
+> instruction, both the `CMD` and `ENTRYPOINT` instructions should be specified 
+> with the JSON array format.
+
 When used in the shell or exec formats, the `CMD` instruction sets the command
 to be executed when running the image.