فهرست منبع

Minor tweak to build -f text to make it clear Dockerfile is in context

Closes #11289

Signed-off-by: Doug Davis <dug@us.ibm.com>
Doug Davis 10 سال پیش
والد
کامیت
1b46248a33
3فایلهای تغییر یافته به همراه4 افزوده شده و 4 حذف شده
  1. 1 1
      api/client/commands.go
  2. 2 2
      docs/man/docker-build.1.md
  3. 1 1
      docs/sources/reference/commandline/cli.md

+ 1 - 1
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")
 	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)
 
 

+ 2 - 2
docs/man/docker-build.1.md

@@ -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*

+ 1 - 1
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
     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