diff --git a/pkg/compose/convergence.go b/pkg/compose/convergence.go index e19866790..5f10e3986 100644 --- a/pkg/compose/convergence.go +++ b/pkg/compose/convergence.go @@ -191,7 +191,6 @@ func (c *convergence) ensureService(ctx context.Context, project *types.Project, case ContainerCreated: case ContainerRestarting: case ContainerExited: - w.Event(progress.CreatedEvent(name)) default: container := container eg.Go(tracing.EventWrapFuncForErrGroup(ctx, "service/start", tracing.ContainerOptions(container), func(ctx context.Context) error { diff --git a/pkg/e2e/fixtures/network-recreate/compose.yaml b/pkg/e2e/fixtures/network-recreate/compose.yaml new file mode 100644 index 000000000..06a0a3e63 --- /dev/null +++ b/pkg/e2e/fixtures/network-recreate/compose.yaml @@ -0,0 +1,10 @@ +services: + web: + image: nginx + networks: + - test + +networks: + test: + labels: + - foo=${FOO:-foo} \ No newline at end of file diff --git a/pkg/e2e/networks_test.go b/pkg/e2e/networks_test.go index cbd4e0e71..68c8f5f45 100644 --- a/pkg/e2e/networks_test.go +++ b/pkg/e2e/networks_test.go @@ -199,3 +199,24 @@ func TestInterfaceName(t *testing.T) { }) res.Assert(t, icmd.Expected{Out: "foobar@"}) } + +func TestNetworkRecreate(t *testing.T) { + c := NewCLI(t) + const projectName = "network_recreate" + t.Cleanup(func() { + c.cleanupWithDown(t, projectName) + }) + c.RunDockerComposeCmd(t, "-f", "./fixtures/network-recreate/compose.yaml", "--project-name", projectName, "up", "-d") + + c = NewCLI(t, WithEnv("FOO=bar")) + res := c.RunDockerComposeCmd(t, "-f", "./fixtures/network-recreate/compose.yaml", "--project-name", projectName, "--progress=plain", "up", "-d") + err := res.Stderr() + fmt.Println(err) + res.Assert(t, icmd.Expected{Err: ` + Container network_recreate-web-1 Stopped + Network network_recreate_test Removed + Network network_recreate_test Creating + Network network_recreate_test Created + Container network_recreate-web-1 Starting + Container network_recreate-web-1 Started`}) +}