1. docker
  2. Commit 37869b237ccd6c8f48132d9372111acdf9533d1b
Browse code

Merge pull request #25774 from ddgenome/cmd-entrypoint-table

Update ENTRYPOINT/CMD table to agree with docs

Sven Dowideit authored on 2016/09/15 08:35:13
Showing 1 changed files
docs/reference/builder.md
History View file @ 37869b2
... ... 
@@ -1168,12 +1168,12 @@ or for executing an ad-hoc command in a container.
1168 1168
1169 1169 
 The table below shows what command is executed for different `ENTRYPOINT` / `CMD` combinations:
1170 1170
1171 
-|                                | No ENTRYPOINT              | ENTRYPOINT exec_entry p1_entry                            | ENTRYPOINT ["exec_entry", "p1_entry"]          |
1172 
-|--------------------------------|----------------------------|-----------------------------------------------------------|------------------------------------------------|
1173 
-| **No CMD**                     | *error, not allowed*       | /bin/sh -c exec_entry p1_entry                            | exec_entry p1_entry                            |
1174 
-| **CMD ["exec_cmd", "p1_cmd"]** | exec_cmd p1_cmd            | /bin/sh -c exec_entry p1_entry exec_cmd p1_cmd            | exec_entry p1_entry exec_cmd p1_cmd            |
1175 
-| **CMD ["p1_cmd", "p2_cmd"]**   | p1_cmd p2_cmd              | /bin/sh -c exec_entry p1_entry p1_cmd p2_cmd              | exec_entry p1_entry p1_cmd p2_cmd              |
1176 
-| **CMD exec_cmd p1_cmd**        | /bin/sh -c exec_cmd p1_cmd | /bin/sh -c exec_entry p1_entry /bin/sh -c exec_cmd p1_cmd | exec_entry p1_entry /bin/sh -c exec_cmd p1_cmd |
1171 
+|                                | No ENTRYPOINT              | ENTRYPOINT exec_entry p1_entry | ENTRYPOINT ["exec_entry", "p1_entry"]          |
1172 
+|--------------------------------|----------------------------|--------------------------------|------------------------------------------------|
1173 
+| **No CMD**                     | *error, not allowed*       | /bin/sh -c exec_entry p1_entry | exec_entry p1_entry                            |
1174 
+| **CMD ["exec_cmd", "p1_cmd"]** | exec_cmd p1_cmd            | /bin/sh -c exec_entry p1_entry | exec_entry p1_entry exec_cmd p1_cmd            |
1175 
+| **CMD ["p1_cmd", "p2_cmd"]**   | p1_cmd p2_cmd              | /bin/sh -c exec_entry p1_entry | exec_entry p1_entry p1_cmd p2_cmd              |
1176 
+| **CMD exec_cmd p1_cmd**        | /bin/sh -c exec_cmd p1_cmd | /bin/sh -c exec_entry p1_entry | exec_entry p1_entry /bin/sh -c exec_cmd p1_cmd |
1177 1177
1178 1178 
 ## VOLUME
1179 1179