Merge pull request #1924 from yongtang/25696-stop-signal

Add `StopSignal` to `ContainerSpec` for `--stop-signal`
moby · Feb 16, 2017 · 6bc357e · 6bc357e
2 parents 120fae7 + 2167d44
commit 6bc357e
Show file tree

Hide file tree

Showing 4 changed files with 176 additions and 109 deletions.
diff --git a/agent/exec/container/container.go b/agent/exec/container/container.go
@@ -139,6 +139,7 @@ func (c *containerConfig) exposedPorts() map[nat.Port]struct{} {
 func (c *containerConfig) config() *enginecontainer.Config {
 	config := &enginecontainer.Config{
 		Labels:       c.labels(),
+		StopSignal:   c.spec().StopSignal,
 		User:         c.spec().User,
 		Hostname:     c.spec().Hostname,
 		Env:          c.spec().Env,

diff --git a/agent/exec/container/container_test.go b/agent/exec/container/container_test.go
@@ -130,3 +130,21 @@ func TestExtraHosts(t *testing.T) {
 		t.Fatalf("expected %s, got %s", expected, actual)
 	}
 }
+
+func TestStopSignal(t *testing.T) {
+	c := containerConfig{
+		task: &api.Task{
+			Spec: api.TaskSpec{Runtime: &api.TaskSpec_Container{
+				Container: &api.ContainerSpec{
+					StopSignal: "SIGWINCH",
+				},
+			}},
+		},
+	}
+
+	expected := "SIGWINCH"
+	actual := c.config().StopSignal
+	if actual != expected {
+		t.Fatalf("expected %s, got %s", expected, actual)
+	}
+}