start container with HostConfig was deprecated since v1.10 and removed since v1.12

xiejunan · xiejunan · commit a76dd3d4723f · 2016-08-08T16:07:30.000+08:00
Change-Id: I04191097961f0f35508c6bda219a0053e3119e1d
Signed-off-by: xiejunan &lt;xiejunan@huawei.com&gt;
diff --git a/core/container/dockercontroller/dockercontroller.go b/core/container/dockercontroller/dockercontroller.go
@@ -191,10 +191,8 @@ func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID, args []string,
 		}
 	}
 
-	// Baohua: getDockerHostConfig() will be ignored when communicating with docker API 1.24+.
-	// I keep it here for a short-term compatibility.
-	// See https://goo.gl/ZvtkKm for more details.
-	err = client.StartContainer(containerID, getDockerHostConfig())
+	// start container with HostConfig was deprecated since v1.10 and removed in v1.2
+	err = client.StartContainer(containerID, nil)
 	if err != nil {
 		dockerLogger.Errorf("start-could not start container %s", err)
 		return err

Original file line number	Diff line number	Diff line change
`@@ -191,10 +191,8 @@ func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID, args []string,`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`194`		`- // Baohua: getDockerHostConfig() will be ignored when communicating with docker API 1.24+.`
`195`		`- // I keep it here for a short-term compatibility.`
`196`		`- // See https://goo.gl/ZvtkKm for more details.`
`197`		`- err = client.StartContainer(containerID, getDockerHostConfig())`
	`194`	`+ // start container with HostConfig was deprecated since v1.10 and removed in v1.2`
	`195`	`+ err = client.StartContainer(containerID, nil)`
`198`	`196`	`if err != nil {`
`199`	`197`	`dockerLogger.Errorf("start-could not start container %s", err)`
`200`	`198`	`return err`