From d08f3e0bdb64a8f88335741f05e76baa2e10a026 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 1 May 2019 11:26:14 +0200 Subject: [PATCH 1/2] document entrypoint option --- website/source/docs/builders/docker.html.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/website/source/docs/builders/docker.html.md b/website/source/docs/builders/docker.html.md index 83726aa33..b39e0a860 100644 --- a/website/source/docs/builders/docker.html.md +++ b/website/source/docs/builders/docker.html.md @@ -214,7 +214,13 @@ You must specify (only) one of `commit`, `discard`, or `export_path`. using a linux container, and `["-d", "-i", "-t", "--entrypoint=powershell", "--", "{{.Image}}"]` if you are running a windows container. {{.Image}} is a template variable that - corresponds to the `image` template option. + corresponds to the `image` template option. Passing the entrypoint option + this way will make it the default entrypoint of the resulting image, so + running `docker run -it --rm $IMAGE` will start the docker image from the + `/bin/sh` shell interpreter; you could run a script or another shell by + running `docker run -it --rm $IMAGE -c /bin/bash`. If your docker image + embeds a binary intended do be run often, you should consider changing the + default entrypoint to point to it. - `volumes` (map of strings to strings) - A mapping of additional volumes to mount into this container. The key of the object is the host path, the From 16f0a8005429b0cf241cd055a857930159a6c611 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 1 May 2019 11:02:44 -0700 Subject: [PATCH 2/2] Update website/source/docs/builders/docker.html.md --- website/source/docs/builders/docker.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/builders/docker.html.md b/website/source/docs/builders/docker.html.md index b39e0a860..6e70ef6de 100644 --- a/website/source/docs/builders/docker.html.md +++ b/website/source/docs/builders/docker.html.md @@ -219,7 +219,7 @@ You must specify (only) one of `commit`, `discard`, or `export_path`. running `docker run -it --rm $IMAGE` will start the docker image from the `/bin/sh` shell interpreter; you could run a script or another shell by running `docker run -it --rm $IMAGE -c /bin/bash`. If your docker image - embeds a binary intended do be run often, you should consider changing the + embeds a binary intended to be run often, you should consider changing the default entrypoint to point to it. - `volumes` (map of strings to strings) - A mapping of additional volumes to