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

Merge pull request #9968 from HuKeping/master

Browse source 
log: Add restart policy name to the inspect information of container
This commit is contained in:
Michael Crosby 2015-01-19 11:08:32 -08:00
commit 4c38045be1
2 changed files with 70 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

69
integration-cli/docker_cli_restart_test.go
View file

@ -151,3 +151,72 @@ func TestRestartWithVolumes(t *testing.T) {
logDone("restart - does not create a new volume on restart") logDone("restart - does not create a new volume on restart")
} }
func TestRecordRestartPolicyNO(t *testing.T) {
defer deleteAllContainers()
cmd := exec.Command(dockerBinary, "run", "-d", "--restart=no", "busybox", "false")
out, _, err := runCommandWithOutput(cmd)
if err != nil {
t.Fatal(err, out)
}
id := strings.TrimSpace(string(out))
name, err := inspectField(id, "HostConfig.RestartPolicy.Name")
if err != nil {
t.Fatal(err, out)
}
if name != "no" {
t.Fatalf("Container restart policy name is %s, expected %s", name, "no")
}
logDone("restart - recording restart policy name for --restart=no")
}
func TestRecordRestartPolicyAlways(t *testing.T) {
defer deleteAllContainers()
cmd := exec.Command(dockerBinary, "run", "-d", "--restart=always", "busybox", "false")
out, _, err := runCommandWithOutput(cmd)
if err != nil {
t.Fatal(err, out)
}
id := strings.TrimSpace(string(out))
name, err := inspectField(id, "HostConfig.RestartPolicy.Name")
if err != nil {
t.Fatal(err, out)
}
if name != "always" {
t.Fatalf("Container restart policy name is %s, expected %s", name, "always")
}
cmd = exec.Command(dockerBinary, "stop", id)
out, _, err = runCommandWithOutput(cmd)
if err != nil {
t.Fatal(err, out)
}
logDone("restart - recording restart policy name for --restart=always")
}
func TestRecordRestartPolicyOnFailure(t *testing.T) {
defer deleteAllContainers()
cmd := exec.Command(dockerBinary, "run", "-d", "--restart=on-failure:1", "busybox", "false")
out, _, err := runCommandWithOutput(cmd)
if err != nil {
t.Fatal(err, out)
}
id := strings.TrimSpace(string(out))
name, err := inspectField(id, "HostConfig.RestartPolicy.Name")
if err != nil {
t.Fatal(err, out)
}
if name != "on-failure" {
t.Fatalf("Container restart policy name is %s, expected %s", name, "on-failure")
}
logDone("restart - recording restart policy name for --restart=on-failure")
}

5
runconfig/parse.go
View file

@ -336,18 +336,15 @@ func parseRestartPolicy(policy string) (RestartPolicy, error) {
name = parts[0] name = parts[0]
) )
p.Name = name
switch name { switch name {
case "always": case "always":
p.Name = name
if len(parts) == 2 { if len(parts) == 2 {
return p, fmt.Errorf("maximum restart count not valid with restart policy of \"always\"") return p, fmt.Errorf("maximum restart count not valid with restart policy of \"always\"")
} }
case "no": case "no":
// do nothing // do nothing
case "on-failure": case "on-failure":
p.Name = name
if len(parts) == 2 { if len(parts) == 2 {
count, err := strconv.Atoi(parts[1]) count, err := strconv.Atoi(parts[1])
if err != nil { if err != nil {