Browse Source

Merge pull request #1182 from dotcloud/change_build_usage

change tag -> repository name (and optionally a tag) in build usage
Victor Vieux 12 years ago
parent
commit
dd8c59892c

+ 1 - 2
commands.go

@@ -159,10 +159,9 @@ func mkBuildContext(dockerfile string, files [][2]string) (Archive, error) {
 
 func (cli *DockerCli) CmdBuild(args ...string) error {
 	cmd := Subcmd("build", "[OPTIONS] PATH | URL | -", "Build a new container image from the source code at PATH")
-	tag := cmd.String("t", "", "Tag to be applied to the resulting image in case of success")
+	tag := cmd.String("t", "", "Repository name (and optionally a tag) to be applied to the resulting image in case of success")
 	suppressOutput := cmd.Bool("q", false, "Suppress verbose build output")
 	noCache := cmd.Bool("no-cache", false, "Do not use cache when building the image")
-
 	if err := cmd.Parse(args); err != nil {
 		return nil
 	}

+ 1 - 1
docs/sources/api/docker_remote_api_v1.0.rst

@@ -832,7 +832,7 @@ Build an image from Dockerfile via stdin
 	   
 	   {{ STREAM }}
 
-	:query t: tag to be applied to the resulting image in case of success
+	:query t: repository name to be applied to the resulting image in case of success
 	:statuscode 200: no error
         :statuscode 500: server error
 

+ 1 - 1
docs/sources/api/docker_remote_api_v1.2.rst

@@ -870,7 +870,7 @@ Build an image from Dockerfile via stdin
 	   
 	   {{ STREAM }}
 
-	:query t: tag to be applied to the resulting image in case of success
+	:query t: repository name to be applied to the resulting image in case of success
 	:query remote: resource to fetch, as URI
 	:statuscode 200: no error
         :statuscode 500: server error

+ 1 - 1
docs/sources/api/docker_remote_api_v1.3.rst

@@ -925,7 +925,7 @@ Build an image from Dockerfile via stdin
 
         The Content-type header should be set to "application/tar".
 
-	:query t: tag to be applied to the resulting image in case of success
+	:query t: repository name (and optionally a tag) to be applied to the resulting image in case of success
 	:query q: suppress verbose build output
 	:statuscode 200: no error
         :statuscode 500: server error

+ 1 - 1
docs/sources/api/docker_remote_api_v1.4.rst

@@ -926,7 +926,7 @@ Build an image from Dockerfile via stdin
 
         The Content-type header should be set to "application/tar".
 
-	:query t: tag to be applied to the resulting image in case of success
+	:query t: repository name (and optionally a tag) to be applied to the resulting image in case of success
 	:query q: suppress verbose build output
     :query nocache: do not use the cache when building the image
 	:statuscode 200: no error

+ 8 - 1
docs/sources/commandline/command/build.rst

@@ -10,7 +10,7 @@
 
     Usage: docker build [OPTIONS] PATH | URL | -
     Build a new container image from the source code at PATH
-      -t="": Tag to be applied to the resulting image in case of success.
+      -t="": Repository name (and optionally a tag) to be applied to the resulting image in case of success.
       -q=false: Suppress verbose build output.
       -no-cache: Do not use the cache when building the image.
     When a single Dockerfile is given as URL, then no context is set. When a git repository is set as URL, the repository is used as context
@@ -29,6 +29,13 @@ Examples
 | If the absolute path is provided instead of '.', only the files and directories required by the ADD commands from the Dockerfile will be added to the context and transferred to the docker daemon.
 |
 
+.. code-block:: bash
+
+   docker build -t vieux/apache:2.0 .
+
+| This will build like the preview example, but it will then tag the resulting image, the repository name will be 'vieux/apache' and the tag will be '2.0'
+
+
 .. code-block:: bash
 
     docker build - < Dockerfile