Bläddra i källkod

Change 'Uploading context' wording

Docker-DCO-1.1-Signed-off-by: Ryan Stelly <ryan.stelly@live.com> (github: FLGMwt)
FLGMwt 11 år sedan
förälder
incheckning
50417f6abc

+ 2 - 2
api/client/commands.go

@@ -172,9 +172,9 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
 	// FIXME: ProgressReader shouldn't be this annoying to use
 	// FIXME: ProgressReader shouldn't be this annoying to use
 	if context != nil {
 	if context != nil {
 		sf := utils.NewStreamFormatter(false)
 		sf := utils.NewStreamFormatter(false)
-		body = utils.ProgressReader(context, 0, cli.err, sf, true, "", "Uploading context")
+		body = utils.ProgressReader(context, 0, cli.err, sf, true, "", "Sending build context to Docker daemon")
 	}
 	}
-	// Upload the build context
+	// Send the build context
 	v := &url.Values{}
 	v := &url.Values{}
 
 
 	//Check if the given image name can be resolved
 	//Check if the given image name can be resolved

+ 1 - 1
contrib/man/md/Dockerfile.5.md

@@ -34,7 +34,7 @@ A Dockerfile is similar to a Makefile.
     The path to the source repository defines where to find the context of the
     The path to the source repository defines where to find the context of the
     build. The build is run by the docker daemon, not the CLI. The whole 
     build. The build is run by the docker daemon, not the CLI. The whole 
     context must be transferred to the daemon. The Docker CLI reports 
     context must be transferred to the daemon. The Docker CLI reports 
-    "Uploading context" when the context is sent to the daemon.
+    "Sending build context to Docker daemon" when the context is sent to the daemon.
     
     
 **sudo docker build -t repository/tag .**
 **sudo docker build -t repository/tag .**
  -- specifies a repository and tag at which to save the new image if the build 
  -- specifies a repository and tag at which to save the new image if the build 

+ 1 - 1
contrib/man/md/docker-build.1.md

@@ -17,7 +17,7 @@ be used by **ADD** commands found within the Dockerfile.
 Warning, this will send a lot of data to the Docker daemon depending
 Warning, this will send a lot of data to the Docker daemon depending
 on the contents of the current directory. The build is run by the Docker 
 on the contents of the current directory. The build is run by the Docker 
 daemon, not by the CLI, so the whole context must be transferred to the daemon. 
 daemon, not by the CLI, so the whole context must be transferred to the daemon. 
-The Docker CLI reports "Uploading context" when the context is sent to 
+The Docker CLI reports "Sending build context to Docker daemon" when the context is sent to 
 the daemon.
 the daemon.
 
 
 When a single Dockerfile is given as the URL, then no context is set.
 When a single Dockerfile is given as the URL, then no context is set.

+ 1 - 1
docs/sources/reference/builder.md

@@ -23,7 +23,7 @@ Then call `docker build` with the path of you source repository as argument
 The path to the source repository defines where to find the *context* of
 The path to the source repository defines where to find the *context* of
 the build. The build is run by the Docker daemon, not by the CLI, so the
 the build. The build is run by the Docker daemon, not by the CLI, so the
 whole context must be transferred to the daemon. The Docker CLI reports
 whole context must be transferred to the daemon. The Docker CLI reports
-"Uploading context" when the context is sent to the daemon.
+"Sending build context to Docker daemon" when the context is sent to the daemon.
 
 
 You can specify a repository and tag at which to save the new image if
 You can specify a repository and tag at which to save the new image if
 the build succeeds:
 the build succeeds:

+ 1 - 1
docs/sources/reference/commandline/cli.md

@@ -259,7 +259,7 @@ happens at the client side (where you're running
 
 
 The transfer of context from the local machine to the Docker daemon is
 The transfer of context from the local machine to the Docker daemon is
 what the `docker` client means when you see the
 what the `docker` client means when you see the
-"Uploading context" message.
+"Sending build context" message.
 
 
 If you wish to keep the intermediate containers after the build is
 If you wish to keep the intermediate containers after the build is
 complete, you must use `--rm=false`. This does not
 complete, you must use `--rm=false`. This does not