Skip to content

Commit

Permalink
start container with HostConfig was deprecated since v1.10 and remove…
Browse files Browse the repository at this point in the history
…d since v1.12

Change-Id: I04191097961f0f35508c6bda219a0053e3119e1d
Signed-off-by: xiejunan <xiejunan@huawei.com>
  • Loading branch information
xiejunan committed Aug 8, 2016
1 parent d48a1c2 commit a76dd3d
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions core/container/dockercontroller/dockercontroller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a76dd3d

Please sign in to comment.