diff options
| author | Yanqiang Miao <miao.yanqiang@zte.com.cn> | 2016-09-20 18:38:56 +0800 |
|---|---|---|
| committer | Yanqiang Miao <miao.yanqiang@zte.com.cn> | 2016-09-20 20:57:17 +0800 |
| commit | 26b6b47420be3e0d932a5e128ac2304b9e93efc2 (patch) | |
| tree | 3cb734f7529421758c6aa81ff6c0ea3bf97b6ac2 | |
| parent | a43691d645e085ad532fdd87a63e9143ba24420a (diff) | |
| download | docker-26b6b47420be3e0d932a5e128ac2304b9e93efc2.tar.gz | |
Remove the support of setting host configuration options when the container starts
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
| -rw-r--r-- | daemon/start.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon/start.go b/daemon/start.go index ed79117c8b..7914b1882a 100644 --- a/daemon/start.go +++ b/daemon/start.go @@ -39,7 +39,7 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *containertypes.Hos // This is kept for backward compatibility - hostconfig should be passed when // creating a container, not during start. if hostConfig != nil { - logrus.Warn("DEPRECATED: Setting host configuration options when the container starts is deprecated and will be removed in Docker 1.12") + logrus.Warn("DEPRECATED: Setting host configuration options when the container starts is deprecated and has been removed in Docker 1.12") oldNetworkMode := container.HostConfig.NetworkMode if err := daemon.setSecurityOptions(container, hostConfig); err != nil { return err @@ -53,7 +53,7 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *containertypes.Hos newNetworkMode := container.HostConfig.NetworkMode if string(oldNetworkMode) != string(newNetworkMode) { // if user has change the network mode on starting, clean up the - // old networks. It is a deprecated feature and will be removed in Docker 1.12 + // old networks. It is a deprecated feature and has been removed in Docker 1.12 container.NetworkSettings.Networks = nil if err := container.ToDisk(); err != nil { return err |