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>
| ... | ... |
@@ -39,7 +39,7 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *containertypes.Hos |
| 39 | 39 |
// This is kept for backward compatibility - hostconfig should be passed when |
| 40 | 40 |
// creating a container, not during start. |
| 41 | 41 |
if hostConfig != nil {
|
| 42 |
- logrus.Warn("DEPRECATED: Setting host configuration options when the container starts is deprecated and will be removed in Docker 1.12")
|
|
| 42 |
+ logrus.Warn("DEPRECATED: Setting host configuration options when the container starts is deprecated and has been removed in Docker 1.12")
|
|
| 43 | 43 |
oldNetworkMode := container.HostConfig.NetworkMode |
| 44 | 44 |
if err := daemon.setSecurityOptions(container, hostConfig); err != nil {
|
| 45 | 45 |
return err |
| ... | ... |
@@ -53,7 +53,7 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *containertypes.Hos |
| 53 | 53 |
newNetworkMode := container.HostConfig.NetworkMode |
| 54 | 54 |
if string(oldNetworkMode) != string(newNetworkMode) {
|
| 55 | 55 |
// if user has change the network mode on starting, clean up the |
| 56 |
- // old networks. It is a deprecated feature and will be removed in Docker 1.12 |
|
| 56 |
+ // old networks. It is a deprecated feature and has been removed in Docker 1.12 |
|
| 57 | 57 |
container.NetworkSettings.Networks = nil |
| 58 | 58 |
if err := container.ToDisk(); err != nil {
|
| 59 | 59 |
return err |