Adds app name to network bridge to make it thread safe

Author: Forest Eckhardt

internal/docker/setup.go

@@ -118,7 +118,7 @@ func (s Setup) Run(ctx context.Context, logs io.Writer, name, path string) (stri
 		return "", fmt.Errorf("failed to copy image pull logs: %w", err)
 	}
 
-	err = s.networks.Create(ctx, InternalNetworkName, "bridge", true)
+	err = s.networks.Create(ctx, fmt.Sprintf("%s-%s", InternalNetworkName, name), "bridge", true)
 	if err != nil {
 		return "", fmt.Errorf("failed to create network: %w", err)
 	}
@@ -190,7 +190,7 @@ func (s Setup) Run(ctx context.Context, logs io.Writer, name, path string) (stri
 	}
 
 	hostConfig := container.HostConfig{
-		NetworkMode: container.NetworkMode(InternalNetworkName),
+		NetworkMode: container.NetworkMode(fmt.Sprintf("%s-%s", InternalNetworkName, name)),
 	}
 
 	resp, err := s.client.ContainerCreate(ctx, &containerConfig, &hostConfig, nil, nil, name)

internal/docker/setup_test.go

@@ -110,7 +110,7 @@ func testSetup(t *testing.T, context spec.G, it spec.S) {
 
 			Expect(client.ImagePullCall.Receives.Ref).To(Equal("cloudfoundry/default-stack:latest"))
 
-			Expect(networkManager.CreateCall.Receives.Name).To(Equal("switchblade-internal"))
+			Expect(networkManager.CreateCall.Receives.Name).To(Equal("switchblade-internal-some-app"))
 			Expect(networkManager.CreateCall.Receives.Driver).To(Equal("bridge"))
 			Expect(networkManager.CreateCall.Receives.Internal).To(BeTrue())
 
@@ -138,7 +138,7 @@ func testSetup(t *testing.T, context spec.G, it spec.S) {
 				WorkingDir: "/home/vcap",
 			}))
 			Expect(client.ContainerCreateCall.Receives.HostConfig).To(Equal(&container.HostConfig{
-				NetworkMode: container.NetworkMode("switchblade-internal"),
+				NetworkMode: container.NetworkMode("switchblade-internal-some-app"),
 			}))
 			Expect(client.ContainerCreateCall.Receives.ContainerName).To(Equal("some-app"))
 

internal/docker/start.go

@@ -122,7 +122,7 @@ func (s Start) Run(ctx context.Context, logs io.Writer, name, command string) (s
 
 	hostConfig := container.HostConfig{
 		PublishAllPorts: true,
-		NetworkMode:     container.NetworkMode(InternalNetworkName),
+		NetworkMode:     container.NetworkMode(fmt.Sprintf("%s-%s", InternalNetworkName, name)),
 	}
 
 	resp, err := s.client.ContainerCreate(ctx, &containerConfig, &hostConfig, nil, nil, name)
@@ -178,7 +178,7 @@ func (s Start) Run(ctx context.Context, logs io.Writer, name, command string) (s
 	}
 
 	var internalURL string
-	network, ok := container.NetworkSettings.Networks[InternalNetworkName]
+	network, ok := container.NetworkSettings.Networks[fmt.Sprintf("%s-%s", InternalNetworkName, name)]
 	if ok {
 		internalURL = fmt.Sprintf("http://%s:8080", network.IPAddress)
 	}

internal/docker/start_test.go

@@ -79,7 +79,7 @@ func testStart(t *testing.T, context spec.G, it spec.S) {
 						},
 					},
 					Networks: map[string]*network.EndpointSettings{
-						"switchblade-internal": {
+						"switchblade-internal-some-app": {
 							IPAddress: "172.19.0.2",
 						},
 					},
@@ -129,7 +129,7 @@ func testStart(t *testing.T, context spec.G, it spec.S) {
 			}))
 			Expect(client.ContainerCreateCall.Receives.HostConfig).To(Equal(&container.HostConfig{
 				PublishAllPorts: true,
-				NetworkMode:     container.NetworkMode("switchblade-internal"),
+				NetworkMode:     container.NetworkMode("switchblade-internal-some-app"),
 			}))
 
 			Expect(networkManager.ConnectCall.Receives.ContainerID).To(Equal("some-container-id"))

internal/docker/teardown.go

@@ -45,7 +45,7 @@ func (t Teardown) Run(ctx context.Context, name string) error {
 		return fmt.Errorf("failed to remove container: %w", err)
 	}
 
-	err = t.networks.Delete(ctx, InternalNetworkName)
+	err = t.networks.Delete(ctx, fmt.Sprintf("%s-%s", InternalNetworkName, name))
 	if err != nil {
 		return fmt.Errorf("failed to delete network: %w", err)
 	}

internal/docker/teardown_test.go

@@ -78,7 +78,7 @@ func testTeardown(t *testing.T, context spec.G, it spec.S) {
 				Force: true,
 			}))
 
-			Expect(networkManager.DeleteCall.Receives.Name).To(Equal("switchblade-internal"))
+			Expect(networkManager.DeleteCall.Receives.Name).To(Equal("switchblade-internal-some-app"))
 
 			Expect(filepath.Join(workspace, "droplets", "some-app.tar.gz")).NotTo(BeAnExistingFile())
 			Expect(filepath.Join(workspace, "source", "some-app.tar.gz")).NotTo(BeAnExistingFile())