fix: workspace creation log duplication (#18)

Signed-off-by: Toma Puljak <[email protected]>

pkg/provider/provider.go

@@ -223,7 +223,14 @@ func (p DockerProvider) CreateProject(projectReq *provider.ProjectRequest) (*typ
 		return new(types.Empty), err
 	}
 
-	err = util.StartContainer(client, projectReq.Project, &logWriter)
+	go func() {
+		err := util.GetContainerLogs(client, util.GetContainerName(projectReq.Project), &logWriter)
+		if err != nil {
+			logWriter.Write([]byte(err.Error()))
+		}
+	}()
+
+	err = util.StartContainer(client, projectReq.Project, nil)
 	if err != nil {
 		return new(types.Empty), err
 	}

pkg/provider/util/container_logs.go

@@ -0,0 +1,30 @@
+package util
+
+import (
+	"context"
+	"io"
+
+	docker_types "github.com/docker/docker/api/types"
+	"github.com/docker/docker/client"
+	"github.com/docker/docker/pkg/stdcopy"
+)
+
+func GetContainerLogs(client *client.Client, containerName string, logWriter *io.Writer) error {
+	if logWriter == nil {
+		return nil
+	}
+
+	logs, err := client.ContainerLogs(context.Background(), containerName, docker_types.ContainerLogsOptions{
+		ShowStdout: true,
+		ShowStderr: true,
+		Follow:     true,
+	})
+	if err != nil {
+		return err
+	}
+	defer logs.Close()
+
+	_, err = stdcopy.StdCopy(*logWriter, *logWriter, logs)
+
+	return err
+}

pkg/provider/util/start_container.go

@@ -8,14 +8,19 @@ import (
 	"github.com/daytonaio/daytona/pkg/types"
 	docker_types "github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/stdcopy"
 )
 
 func StartContainer(client *client.Client, project *types.Project, logWriter *io.Writer) error {
 	containerName := GetContainerName(project)
 	ctx := context.Background()
 
-	err := client.ContainerStart(ctx, containerName, docker_types.ContainerStartOptions{})
+	inspect, err := client.ContainerInspect(ctx, containerName)
+
+	if err == nil && inspect.State.Running {
+		return nil
+	}
+
+	err = client.ContainerStart(ctx, containerName, docker_types.ContainerStartOptions{})
 	if err != nil {
 		return err
 	}
@@ -37,18 +42,10 @@ func StartContainer(client *client.Client, project *types.Project, logWriter *io
 
 	if logWriter != nil {
 		go func() {
-			logs, err := client.ContainerLogs(ctx, containerName, docker_types.ContainerLogsOptions{
-				ShowStdout: true,
-				ShowStderr: true,
-				Follow:     true,
-			})
+			err := GetContainerLogs(client, containerName, logWriter)
 			if err != nil {
 				(*logWriter).Write([]byte(err.Error()))
-				return
 			}
-			defer logs.Close()
-
-			stdcopy.StdCopy(*logWriter, *logWriter, logs)
 		}()
 	}