From a66de11c31fc732fc30c41f5e29c978095b4942d Mon Sep 17 00:00:00 2001
From: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com>
Date: Wed, 16 Oct 2019 19:09:11 +0200
Subject: [PATCH] #8225 Add Docker shell and exec format documentation for CMD
 and ENTRYPOINT

---
 website/source/docs/builders/docker.html.md.erb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/website/source/docs/builders/docker.html.md.erb b/website/source/docs/builders/docker.html.md.erb
index 3834e0601..7d3f030b6 100644
--- a/website/source/docs/builders/docker.html.md.erb
+++ b/website/source/docs/builders/docker.html.md.erb
@@ -94,11 +94,12 @@ Allowed metadata fields that can be changed are:
 
 -   CMD
     -   String, supports both array (escaped) and string form
-    -   EX: `"CMD [\"nginx\", \"-g\", \"daemon off;\"]"`
-    -   EX: `"CMD nginx -g daemon off;"`
+    -   EX: `"CMD [\"nginx\", \"-g\", \"daemon off;\"]"` corresponds to Docker exec form
+    -   EX: `"CMD nginx -g daemon off;"` corresponds to Docker shell form, invokes a command shell first
 -   ENTRYPOINT
-    -   String
-    -   EX: `"ENTRYPOINT /var/www/start.sh"`
+    -   String, supports both array (escaped) and string form
+    -   EX: `"ENTRYPOINT [\"/bin/sh\", \"-c\", \"/var/www/start.sh\"]"` corresponds to Docker exec form
+    -   EX: `"ENTRYPOINT /var/www/start.sh"` corresponds to Docker shell form, invokes a command shell first
 -   ENV
     -   String, note there is no equal sign:
     -   EX: `"ENV HOSTNAME www.example.com"` not