Merge pull request #18561 from hqhq/hq_adapt_at_start

Adapt container settings when start

daemon/start.go

@@ -30,9 +30,6 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *runconfig.HostConf
 		// 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")
-			if err := daemon.adaptContainerSettings(hostConfig, false); err != nil {
-				return err
-			}
 			if err := daemon.setHostConfig(container, hostConfig); err != nil {
 				return err
 			}
@@ -49,6 +46,11 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *runconfig.HostConf
 	if _, err = daemon.verifyContainerSettings(container.HostConfig, nil); err != nil {
 		return err
 	}
+	// Adapt for old containers in case we have updates in this function and
+	// old containers never have chance to call the new function in create stage.
+	if err := daemon.adaptContainerSettings(container.HostConfig, false); err != nil {
+		return err
+	}
 
 	return daemon.containerStart(container)
 }