diff --git a/pkg/compose/create.go b/pkg/compose/create.go index 3e5590e91..639c1fba3 100644 --- a/pkg/compose/create.go +++ b/pkg/compose/create.go @@ -1363,7 +1363,6 @@ func (s *composeService) resolveExternalNetwork(ctx context.Context, n *types.Ne switch len(networks) { case 1: - n.Name = networks[0].ID return nil case 0: enabled, err := s.isSWarmEnabled(ctx) diff --git a/pkg/e2e/watch_test.go b/pkg/e2e/watch_test.go index 4f7ebda25..d7b56435e 100644 --- a/pkg/e2e/watch_test.go +++ b/pkg/e2e/watch_test.go @@ -99,9 +99,8 @@ func TestRebuildOnDotEnvWithExternalNetwork(t *testing.T) { errors) }, 30*time.Second, 1*time.Second) - n := c.RunDockerCmd(t, "network", "inspect", networkName, "-f", "{{ .Id }}") pn := c.RunDockerCmd(t, "inspect", containerName, "-f", "{{ .HostConfig.NetworkMode }}") - assert.Equal(t, pn.Stdout(), n.Stdout()) + assert.Equal(t, strings.TrimSpace(pn.Stdout()), networkName) t.Log("create a dotenv file that will be used to trigger the rebuild") err = os.WriteFile(dotEnvFilepath, []byte("HELLO=WORLD\nTEST=REBUILD"), 0o666) @@ -119,9 +118,8 @@ func TestRebuildOnDotEnvWithExternalNetwork(t *testing.T) { return true, fmt.Sprintf("container %s was rebuilt", containerName) }, 30*time.Second, 1*time.Second) - n2 := c.RunDockerCmd(t, "network", "inspect", networkName, "-f", "{{ .Id }}") pn2 := c.RunDockerCmd(t, "inspect", containerName, "-f", "{{ .HostConfig.NetworkMode }}") - assert.Equal(t, pn2.Stdout(), n2.Stdout()) + assert.Equal(t, strings.TrimSpace(pn2.Stdout()), networkName) assert.Check(t, !strings.Contains(r.Combined(), "Application failed to start after update"))