docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docker restarts running OR stopped containers, docs edit rm "running" 

Signed-off-by: Sally O'Malley <somalley@redhat.com>
This commit is contained in:
Sally O'Malley 2015-09-09 06:27:41 -04:00
parent 148be8bd7e
commit e41753678d
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/client/restart.go
View File

@ -9,11 +9,11 @@ import (
flag "github.com/docker/docker/pkg/mflag" flag "github.com/docker/docker/pkg/mflag"
) )
// CmdRestart restarts one or more running containers. // CmdRestart restarts one or more containers.
// //
// Usage: docker restart [OPTIONS] CONTAINER [CONTAINER...] // Usage: docker restart [OPTIONS] CONTAINER [CONTAINER...]
func (cli *DockerCli) CmdRestart(args ...string) error { func (cli *DockerCli) CmdRestart(args ...string) error {
cmd := Cli.Subcmd("restart", []string{"CONTAINER [CONTAINER...]"}, "Restart a running container", true) cmd := Cli.Subcmd("restart", []string{"CONTAINER [CONTAINER...]"}, "Restart a container", true)
nSeconds := cmd.Int([]string{"t", "-time"}, 10, "Seconds to wait for stop before killing the container") nSeconds := cmd.Int([]string{"t", "-time"}, 10, "Seconds to wait for stop before killing the container")
cmd.Require(flag.Min, 1) cmd.Require(flag.Min, 1)

2
contrib/completion/fish/docker.fish
View File

@ -279,7 +279,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from push' -a '(__fish_print
complete -c docker -f -n '__fish_docker_no_subcommand' -a rename -d 'Rename an existing container' complete -c docker -f -n '__fish_docker_no_subcommand' -a rename -d 'Rename an existing container'
# restart # restart
complete -c docker -f -n '__fish_docker_no_subcommand' -a restart -d 'Restart a running container' complete -c docker -f -n '__fish_docker_no_subcommand' -a restart -d 'Restart a container'
complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -l help -d 'Print usage' complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -l help -d 'Print usage'
complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -s t -l time -d 'Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default is 10 seconds.' complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -s t -l time -d 'Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default is 10 seconds.'
complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -a '(__fish_print_docker_containers running)' -d "Container" complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -a '(__fish_print_docker_containers running)' -d "Container"

2
docker/flags.go
View File

@ -46,7 +46,7 @@ var dockerCommands = []command{
{"pull", "Pull an image or a repository from a registry"}, {"pull", "Pull an image or a repository from a registry"},
{"push", "Push an image or a repository to a registry"}, {"push", "Push an image or a repository to a registry"},
{"rename", "Rename a container"}, {"rename", "Rename a container"},
{"restart", "Restart a running container"}, {"restart", "Restart a container"},
{"rm", "Remove one or more containers"}, {"rm", "Remove one or more containers"},
{"rmi", "Remove one or more images"}, {"rmi", "Remove one or more images"},
{"run", "Run a command in a new container"}, {"run", "Run a command in a new container"},

2
docs/reference/commandline/restart.md
View File

@ -13,7 +13,7 @@ weight=1
Usage: docker restart [OPTIONS] CONTAINER [CONTAINER...] Usage: docker restart [OPTIONS] CONTAINER [CONTAINER...]
Restart a running container Restart a container
-t, --time=10 Seconds to wait for stop before killing the container -t, --time=10 Seconds to wait for stop before killing the container

2
man/docker-restart.1.md
View File

@ -2,7 +2,7 @@
% Docker Community % Docker Community
% JUNE 2014 % JUNE 2014
# NAME # NAME
docker-restart - Restart a running container docker-restart - Restart a container
# SYNOPSIS # SYNOPSIS
**docker restart** **docker restart**

2
man/docker.1.md
View File

@ -273,7 +273,7 @@ inside it)
See **docker-rename(1)** for full documentation on the **rename** command. See **docker-rename(1)** for full documentation on the **rename** command.
**restart** **restart**
Restart a running container Restart a container
See **docker-restart(1)** for full documentation on the **restart** command. See **docker-restart(1)** for full documentation on the **restart** command.
**rm** **rm**