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

Added info re: image[:tag] to make docs consistent. Fixed a markdown issue.

Browse source 
Closes issue #6833

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
This commit is contained in:
Fred Lifton 2014-07-16 16:39:44 -07:00
parent f84bcc6bd0
commit 41d6ab6318
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/client/commands.go
View file

@ -1877,7 +1877,7 @@ func (cli *DockerCli) CmdSearch(args ...string) error {
type ports []int type ports []int
func (cli *DockerCli) CmdTag(args ...string) error { func (cli *DockerCli) CmdTag(args ...string) error {
cmd := cli.Subcmd("tag", "[OPTIONS] IMAGE [REGISTRYHOST/][USERNAME/]NAME[:TAG]", "Tag an image into a repository") cmd := cli.Subcmd("tag", "[OPTIONS] IMAGE[:TAG] [REGISTRYHOST/][USERNAME/]NAME[:TAG]", "Tag an image into a repository")
force := cmd.Bool([]string{"f", "#force", "-force"}, false, "Force") force := cmd.Bool([]string{"f", "#force", "-force"}, false, "Force")
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil

7
docs/man/docker-run.1.md
View file

@ -34,7 +34,7 @@ docker-run - Run a command in a new container
[**-v**|**--volume**[=*[]*]] [**-v**|**--volume**[=*[]*]]
[**--volumes-from**[=*[]*]] [**--volumes-from**[=*[]*]]
[**-w**|**--workdir**[=*WORKDIR*]] [**-w**|**--workdir**[=*WORKDIR*]]
IMAGE [COMMAND] [ARG...] IMAGE[:TAG] [COMMAND] [ARG...]
# DESCRIPTION # DESCRIPTION
@ -241,7 +241,10 @@ can override the working directory by using the **-w** option.
**IMAGE** **IMAGE**
The image name or ID. The image name or ID. You can specify a version of an image you'd like to run
the container with by adding image:tag to the command. For example,
`docker run ubuntu:14.04`.
**COMMAND** **COMMAND**

24
docs/sources/reference/run.md
View file

@ -26,18 +26,16 @@ see [*Option types*](/reference/commandline/cli/#option-types).
The list of `[OPTIONS]` breaks down into two groups: The list of `[OPTIONS]` breaks down into two groups:
1. Settings exclusive to operators, including: 1. Settings exclusive to operators, including:
* Detached or Foreground running,
- Detached or Foreground running, * Container Identification,
- Container Identification, * Network settings, and
- Network settings, and * Runtime Constraints on CPU and Memory
- Runtime Constraints on CPU and Memory * Privileges and LXC Configuration
- Privileges and LXC Configuration 2. Settings shared between operators and developers, where operators can
2. Setting shared between operators and developers, where operators can
override defaults developers set in images at build time. override defaults developers set in images at build time.
Together, the `docker run [OPTIONS]` give complete control over runtime Together, the `docker run [OPTIONS]` give the operator complete control over runtime
behavior to the operator, allowing them to override all defaults set by behavior, allowing them to override all defaults set by
the developer during `docker build` and nearly all the defaults set by the developer during `docker build` and nearly all the defaults set by
the Docker runtime itself. the Docker runtime itself.
@ -127,6 +125,12 @@ PID files):
--cidfile="": Write the container ID to the file --cidfile="": Write the container ID to the file
### Image[:tag]
While not strictly a means of identifying a container, you can specify a version of an
image you'd like to run the container with by adding `image[:tag]` to the command. For
example, `docker run ubuntu:14.04`.
## Network Settings ## Network Settings
--dns=[] : Set custom dns servers for the container --dns=[] : Set custom dns servers for the container