|
@@ -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
|