Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error for env variables example in docker reference - 2 

The reason why the issue occurs is because sh parses the first argument after -c as the whole script to execute.
Everything after isn't executed as one might expect.

When working on the 'fix' I found out the same fix is also done in commit 2af7c5cfe24b4c8e931f751979b5e69e20ba77e2, except only for one occurrence.

Signed-off-by: Serhat Gülçiçek <serhat+signoff@equil.nl>
This commit is contained in:
Serhat Gülçiçek 2016-06-20 12:35:26 +02:00 committed by Tibor Vass
parent be6f353670
commit beb09f42d6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/reference/builder.md
View File

@ -606,7 +606,7 @@ instruction as well.
> This means that normal shell processing does not happen. For example, > This means that normal shell processing does not happen. For example,
> `CMD [ "echo", "$HOME" ]` will not do variable substitution on `$HOME`. > `CMD [ "echo", "$HOME" ]` will not do variable substitution on `$HOME`.
> If you want shell processing then either use the *shell* form or execute > If you want shell processing then either use the *shell* form or execute
> a shell directly, for example: `CMD [ "sh", "-c", "echo", "$HOME" ]`. > a shell directly, for example: `CMD [ "sh", "-c", "echo $HOME" ]`.
When used in the shell or exec formats, the `CMD` instruction sets the command When used in the shell or exec formats, the `CMD` instruction sets the command
to be executed when running the image. to be executed when running the image.
@ -1074,7 +1074,7 @@ sys 0m 0.03s
> This means that normal shell processing does not happen. For example, > This means that normal shell processing does not happen. For example,
> `ENTRYPOINT [ "echo", "$HOME" ]` will not do variable substitution on `$HOME`. > `ENTRYPOINT [ "echo", "$HOME" ]` will not do variable substitution on `$HOME`.
> If you want shell processing then either use the *shell* form or execute > If you want shell processing then either use the *shell* form or execute
> a shell directly, for example: `ENTRYPOINT [ "sh", "-c", "echo", "$HOME" ]`. > a shell directly, for example: `ENTRYPOINT [ "sh", "-c", "echo $HOME" ]`.
> Variables that are defined in the `Dockerfile`using `ENV`, will be substituted by > Variables that are defined in the `Dockerfile`using `ENV`, will be substituted by
> the `Dockerfile` parser. > the `Dockerfile` parser.