Merge pull request #417 from vdemeester/319-create-default-network-if-required

Create the default network if required.

Author: vdemeester

docker/network/network.go

@@ -169,6 +169,12 @@ func NetworksFromServices(cli client.NetworkAPIClient, projectName string, netwo
 			networkNames[network.Name] = network
 		}
 	}
+	if len(networkConfigs) == 0 {
+		network := NewNetwork(projectName, "default", &config.NetworkConfig{
+			Driver: "bridge",
+		}, cli)
+		networks = append(networks, network)
+	}
 	for name, config := range networkConfigs {
 		network := NewNetwork(projectName, name, config, cli)
 		networks = append(networks, network)

docker/network/network_test.go

@@ -34,7 +34,12 @@ func TestNetworksFromServices(t *testing.T) {
 		expectedError    bool
 	}{
 		{
-			expectedNetworks: []*Network{},
+			expectedNetworks: []*Network{
+				{
+					name:        "default",
+					projectName: "prj",
+				},
+			},
 		},
 		{
 			networkConfigs: map[string]*config.NetworkConfig{

integration/volume_test.go

@@ -77,6 +77,7 @@ func (s *CliSuite) TestNamedVolume(c *C) {
 }
 
 func (s *CliSuite) TestV2Volume(c *C) {
+	testRequires(c, not(DaemonVersionIs("1.9")))
 	p := s.ProjectFromText(c, "up", `version: "2"
 services:
   with_volume:

project/project.go

@@ -267,10 +267,12 @@ func (p *Project) handleNetworkConfig() {
 				serviceConfig.Networks = &yaml.Networks{
 					Networks: []*yaml.Network{
 						{
-							Name: "default",
+							Name:     "default",
+							RealName: fmt.Sprintf("%s_%s", p.Name, "default"),
 						},
 					},
 				}
+				p.AddNetworkConfig("default", &config.NetworkConfig{})
 			}
 			// Consolidate the name of the network
 			// FIXME(vdemeester) probably shouldn't be there, maybe move that to interface/factory