From 1b46248a332dab1a886d9c4352f9e0057e6c284f Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Wed, 11 Mar 2015 09:04:30 -0700 Subject: [PATCH] Minor tweak to build -f text to make it clear Dockerfile is in context Closes #11289 Signed-off-by: Doug Davis --- api/client/commands.go | 2 +- docs/man/docker-build.1.md | 4 ++-- docs/sources/reference/commandline/cli.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/client/commands.go b/api/client/commands.go index a682befa70..d5af2ad4ef 100644 --- a/api/client/commands.go +++ b/api/client/commands.go @@ -88,7 +88,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error { rm := cmd.Bool([]string{"#rm", "-rm"}, true, "Remove intermediate containers after a successful build") forceRm := cmd.Bool([]string{"-force-rm"}, false, "Always remove intermediate containers") pull := cmd.Bool([]string{"-pull"}, false, "Always attempt to pull a newer version of the image") - dockerfileName := cmd.String([]string{"f", "-file"}, "", "Name of the Dockerfile(Default is 'Dockerfile')") + dockerfileName := cmd.String([]string{"f", "-file"}, "", "Name of the Dockerfile (Default is 'PATH/Dockerfile')") cmd.Require(flag.Exact, 1) diff --git a/docs/man/docker-build.1.md b/docs/man/docker-build.1.md index f6a89b54ed..3a9472b236 100644 --- a/docs/man/docker-build.1.md +++ b/docs/man/docker-build.1.md @@ -7,7 +7,7 @@ docker-build - Build a new image from the source code at PATH # SYNOPSIS **docker build** [**--help**] -[**-f**|**--file**[=*Dockerfile*]] +[**-f**|**--file**[=*PATH/Dockerfile*]] [**--force-rm**[=*false*]] [**--no-cache**[=*false*]] [**--pull**[=*false*]] @@ -33,7 +33,7 @@ When a Git repository is set as the **URL**, the repository is used as context. # OPTIONS -**-f**, **--file**=*Dockerfile* +**-f**, **--file**=*PATH/Dockerfile* Path to the Dockerfile to use. If the path is a relative path then it must be relative to the current directory. The file must be within the build context. The default is *Dockerfile*. **--force-rm**=*true*|*false* diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md index 4987764bfb..d0c3e37f03 100644 --- a/docs/sources/reference/commandline/cli.md +++ b/docs/sources/reference/commandline/cli.md @@ -508,7 +508,7 @@ is returned by the `docker attach` command to its caller too: Build a new image from the source code at PATH - -f, --file="" Name of the Dockerfile(Default is 'Dockerfile') + -f, --file="" Name of the Dockerfile (Default is 'PATH/Dockerfile') --force-rm=false Always remove intermediate containers --no-cache=false Do not use cache when building the image --pull=false Always attempt to pull a newer version of the image