Merge pull request #2469 from dotcloud/hotfix_release2

Hotfix changes for default values in 0.6.5

docker/docker.go

@@ -41,7 +41,7 @@ func main() {
 	flag.Var(&flHosts, "H", "tcp://host:port to bind/connect to or unix://path/to/socket to use")
 	flEnableIptables := flag.Bool("iptables", true, "Disable iptables within docker")
 	flDefaultIp := flag.String("ip", "0.0.0.0", "Default ip address to use when binding a containers ports")
-	flInterContainerComm := flag.Bool("enable-container-comm", false, "Enable inter-container communication")
+	flInterContainerComm := flag.Bool("icc", true, "Enable inter-container communication")
 
 	flag.Parse()
 

runtime.go

@@ -317,18 +317,27 @@ func (runtime *Runtime) Create(config *Config, name string) (*Container, []strin
 		return nil, nil, err
 	}
 
-	if img.Config != nil {
-		if err := MergeConfig(config, img.Config); err != nil {
-			return nil, nil, err
+	checkDeprecatedExpose := func(config *Config) bool {
+		if config != nil {
+			if config.PortSpecs != nil {
+				for _, p := range config.PortSpecs {
+					if strings.Contains(p, ":") {
+						return true
+					}
+				}
+			}
 		}
+		return false
 	}
+
 	warnings := []string{}
-	if config.PortSpecs != nil {
-		for _, p := range config.PortSpecs {
-			if strings.Contains(p, ":") {
-				warnings = append(warnings, "The mapping to public ports on your host has been deprecated. Use -p to publish the ports.")
-				break
-			}
+	if checkDeprecatedExpose(img.Config) || checkDeprecatedExpose(config) {
+		warnings = append(warnings, "The mapping to public ports on your host has been deprecated. Use -p to publish the ports.")
+	}
+
+	if img.Config != nil {
+		if err := MergeConfig(config, img.Config); err != nil {
+			return nil, nil, err
 		}
 	}