kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #11325 from duglin/11289-HelpDashF

Browse source 
Minor tweak to build -f text to make it clear Dockerfile is in context
This commit is contained in:
moxiegirl 2015-03-11 14:58:38 -07:00
commit 24408f1c18
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/client/commands.go
View file

@ -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") 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") 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") 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) cmd.Require(flag.Exact, 1)

4
docs/man/docker-build.1.md
View file

@ -7,7 +7,7 @@ docker-build - Build a new image from the source code at PATH
# SYNOPSIS # SYNOPSIS
**docker build** **docker build**
[**--help**] [**--help**]
[**-f**|**--file**[=*Dockerfile*]] [**-f**|**--file**[=*PATH/Dockerfile*]]
[**--force-rm**[=*false*]] [**--force-rm**[=*false*]]
[**--no-cache**[=*false*]] [**--no-cache**[=*false*]]
[**--pull**[=*false*]] [**--pull**[=*false*]]
@ -33,7 +33,7 @@ When a Git repository is set as the **URL**, the repository is used
as context. as context.
# OPTIONS # 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*. 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* **--force-rm**=*true*|*false*

2
docs/sources/reference/commandline/cli.md
View file

@ -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 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 --force-rm=false Always remove intermediate containers
--no-cache=false Do not use cache when building the image --no-cache=false Do not use cache when building the image
--pull=false Always attempt to pull a newer version of the image --pull=false Always attempt to pull a newer version of the image