Skip to content

Commit

Permalink
feat: refactor to use Daytona DockerClient
Browse files Browse the repository at this point in the history 
This allows custom image, user and continer registries to be used

Signed-off-by: Toma Puljak <[email protected]>
  • Loading branch information
@Tpuljak
Tpuljak committed Apr 26, 2024
1 parent 6b3f97b commit 024565e
Show file tree
Hide file tree
Showing 16 changed files with 114 additions and 864 deletions.
32 changes: 21 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,33 @@ module github.com/daytonaio/daytona-docker-provider
go 1.22.2

require (
github.com/daytonaio/daytona v0.12.0
github.com/docker/docker v24.0.7+incompatible
github.com/daytonaio/daytona v0.13.0-alpha.3
github.com/docker/docker v26.1.0+incompatible
github.com/hashicorp/go-hclog v1.5.0
github.com/hashicorp/go-plugin v1.6.0
github.com/sirupsen/logrus v1.9.3
golang.org/x/crypto v0.21.0
golang.org/x/sync v0.5.0
golang.org/x/sync v0.6.0
golang.org/x/term v0.18.0
)

require (
code.gitea.io/sdk/gitea v0.17.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/davidmz/go-pageant v1.0.2 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-fed/httpsig v1.1.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-github v17.0.0+incompatible // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
Expand All @@ -38,8 +41,8 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/oklog/run v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
Expand All @@ -49,16 +52,23 @@ require (
github.com/tklauser/numcpus v0.7.0 // indirect
github.com/xanzy/go-gitlab v0.97.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.16.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
google.golang.org/grpc v1.60.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/grpc v1.63.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gotest.tools/v3 v3.5.1 // indirect
)
73 changes: 55 additions & 18 deletions go.sum
View file

Large diffs are not rendered by default.

212 changes: 29 additions & 183 deletions pkg/provider/provider.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package provider

import (
"encoding/json"
"errors"
"io"
"os"
Expand All @@ -11,17 +10,13 @@ import (
internal "github.com/daytonaio/daytona-docker-provider/internal"
log_writers "github.com/daytonaio/daytona-docker-provider/internal/log"
"github.com/daytonaio/daytona-docker-provider/pkg/client"
"github.com/daytonaio/daytona-docker-provider/pkg/provider/util"
provider_types "github.com/daytonaio/daytona-docker-provider/pkg/types"

"github.com/daytonaio/daytona/pkg/docker"
"github.com/daytonaio/daytona/pkg/logger"
"github.com/daytonaio/daytona/pkg/provider"
provider_util "github.com/daytonaio/daytona/pkg/provider/util"
"github.com/daytonaio/daytona/pkg/workspace"
docker_types "github.com/docker/docker/api/types"
docker_client "github.com/docker/docker/client"

log "github.com/sirupsen/logrus"
)

type DockerProvider struct {
Expand Down Expand Up @@ -92,25 +87,20 @@ func (p DockerProvider) GetDefaultTargets() (*[]provider.ProviderTarget, error)
return &defaultTargets, nil
}

func (p DockerProvider) getProjectPath(basePath string, project *workspace.Project) string {
return path.Join(basePath, "workspaces", project.WorkspaceId, "projects", project.Name)
}

func (p DockerProvider) CreateWorkspace(workspaceReq *provider.WorkspaceRequest) (*provider_util.Empty, error) {
client, err := p.getClient(workspaceReq.TargetOptions)
if err != nil {
return new(provider_util.Empty), err
}

logWriter := io.MultiWriter(&log_writers.InfoLogWriter{})
if p.LogsDir != nil {
wsLogWriter := logger.NewWorkspaceLogger(*p.LogsDir, workspaceReq.Workspace.Id)
logWriter = io.MultiWriter(&log_writers.InfoLogWriter{}, wsLogWriter)
defer wsLogWriter.Close()
}

err = util.CreateNetwork(client, workspaceReq.Workspace.Id, &logWriter)
return new(provider_util.Empty), err
dockerClient, err := p.getClient(workspaceReq.TargetOptions)
if err != nil {
return new(provider_util.Empty), err
}

return new(provider_util.Empty), dockerClient.CreateWorkspace(workspaceReq.Workspace, logWriter)
}

func (p DockerProvider) StartWorkspace(workspaceReq *provider.WorkspaceRequest) (*provider_util.Empty, error) {
Expand All @@ -122,79 +112,28 @@ func (p DockerProvider) StopWorkspace(workspaceReq *provider.WorkspaceRequest) (
}

func (p DockerProvider) DestroyWorkspace(workspaceReq *provider.WorkspaceRequest) (*provider_util.Empty, error) {
if p.BasePath == nil {
return new(provider_util.Empty), errors.New("BasePath not set. Did you forget to call Initialize?")
}

err := os.RemoveAll(path.Join(*p.BasePath, "workspaces", workspaceReq.Workspace.Id))
if err != nil {
return new(provider_util.Empty), err
}

client, err := p.getClient(workspaceReq.TargetOptions)
dockerClient, err := p.getClient(workspaceReq.TargetOptions)
if err != nil {
return new(provider_util.Empty), err
}

return new(provider_util.Empty), util.RemoveNetwork(client, workspaceReq.Workspace.Id)
return new(provider_util.Empty), dockerClient.DestroyWorkspace(workspaceReq.Workspace)
}

func (p DockerProvider) GetWorkspaceInfo(workspaceReq *provider.WorkspaceRequest) (*workspace.WorkspaceInfo, error) {
providerMetadata, err := p.getWorkspaceMetadata(workspaceReq)
dockerClient, err := p.getClient(workspaceReq.TargetOptions)
if err != nil {
return nil, err
}

workspaceInfo := &workspace.WorkspaceInfo{
Name: workspaceReq.Workspace.Name,
ProviderMetadata: providerMetadata,
}

projectInfos := []*workspace.ProjectInfo{}
for _, project := range workspaceReq.Workspace.Projects {
projectInfo, err := p.GetProjectInfo(&provider.ProjectRequest{
TargetOptions: workspaceReq.TargetOptions,
Project: project,
})
if err != nil {
return nil, err
}
projectInfos = append(projectInfos, projectInfo)
}
workspaceInfo.Projects = projectInfos

return workspaceInfo, nil
return dockerClient.GetWorkspaceInfo(workspaceReq.Workspace)
}

func (p DockerProvider) CreateProject(projectReq *provider.ProjectRequest) (*provider_util.Empty, error) {
if p.ServerDownloadUrl == nil {
return new(provider_util.Empty), errors.New("ServerDownloadUrl not set. Did you forget to call Initialize?")
}

if p.BasePath == nil {
return new(provider_util.Empty), errors.New("BasePath not set. Did you forget to call Initialize?")
}

if p.ServerUrl == nil {
return new(provider_util.Empty), errors.New("ServerUrl not set. Did you forget to call Initialize?")
}

if p.ServerApiUrl == nil {
return new(provider_util.Empty), errors.New("ServerApiUrl not set. Did you forget to call Initialize?")
}

client, err := p.getClient(projectReq.TargetOptions)
if err != nil {
return new(provider_util.Empty), err
}

clonePath := p.getProjectPath(*p.BasePath, projectReq.Project)

err = os.MkdirAll(clonePath, 0755)
if err != nil {
return new(provider_util.Empty), err
}

logWriter := io.MultiWriter(&log_writers.InfoLogWriter{})
if p.LogsDir != nil {
wsLogWriter := logger.NewWorkspaceLogger(*p.LogsDir, projectReq.Project.WorkspaceId)
Expand All @@ -204,160 +143,67 @@ func (p DockerProvider) CreateProject(projectReq *provider.ProjectRequest) (*pro
defer projectLogWriter.Close()
}

err = util.PullImage(client, projectReq.Project.Image, &logWriter)
if err != nil {
return new(provider_util.Empty), err
}

err = util.InitContainer(client, projectReq.Project, clonePath, projectReq.Project.Image, *p.ServerDownloadUrl)
if err != nil {
return new(provider_util.Empty), err
}

err = util.StartContainer(client, projectReq.Project, nil)
dockerClient, err := p.getClient(projectReq.TargetOptions)
if err != nil {
return new(provider_util.Empty), err
}

go func() {
err := util.GetContainerLogs(client, util.GetContainerName(projectReq.Project), &logWriter)
if err != nil {
logWriter.Write([]byte(err.Error()))
}
}()

err = util.WaitForBinaryDownload(client, projectReq.Project)
if err != nil {
return new(provider_util.Empty), err
}

_, err = util.ExecSync(client, util.GetContainerName(projectReq.Project), docker_types.ExecConfig{
User: "daytona",
Privileged: true,
Cmd: []string{"sudo", "chown", "-R", "daytona:daytona", "/workspaces"},
}, nil)
err = dockerClient.CreateProject(projectReq.Project, *p.ServerDownloadUrl, projectReq.ContainerRegistry, logWriter)
if err != nil {
return new(provider_util.Empty), err
}

return new(provider_util.Empty), nil
return new(provider_util.Empty), dockerClient.StartProject(projectReq.Project)
}

func (p DockerProvider) StartProject(projectReq *provider.ProjectRequest) (*provider_util.Empty, error) {
client, err := p.getClient(projectReq.TargetOptions)
dockerClient, err := p.getClient(projectReq.TargetOptions)
if err != nil {
return new(provider_util.Empty), err
}

logWriter := io.MultiWriter(&log_writers.InfoLogWriter{})
if p.LogsDir != nil {
wsLogWriter := logger.NewWorkspaceLogger(*p.LogsDir, projectReq.Project.WorkspaceId)
projectLogWriter := logger.NewProjectLogger(*p.LogsDir, projectReq.Project.WorkspaceId, projectReq.Project.Name)
logWriter = io.MultiWriter(&log_writers.InfoLogWriter{}, wsLogWriter, projectLogWriter)
defer wsLogWriter.Close()
defer projectLogWriter.Close()
}

err = util.StartContainer(client, projectReq.Project, &logWriter)
return new(provider_util.Empty), err
return new(provider_util.Empty), dockerClient.StartProject(projectReq.Project)
}

func (p DockerProvider) StopProject(projectReq *provider.ProjectRequest) (*provider_util.Empty, error) {
client, err := p.getClient(projectReq.TargetOptions)
dockerClient, err := p.getClient(projectReq.TargetOptions)
if err != nil {
return new(provider_util.Empty), err
}

err = util.StopContainer(client, projectReq.Project)
return new(provider_util.Empty), err
return new(provider_util.Empty), dockerClient.StopProject(projectReq.Project)
}

func (p DockerProvider) DestroyProject(projectReq *provider.ProjectRequest) (*provider_util.Empty, error) {
client, err := p.getClient(projectReq.TargetOptions)
dockerClient, err := p.getClient(projectReq.TargetOptions)
if err != nil {
return new(provider_util.Empty), err
}

err = util.RemoveContainer(client, projectReq.Project)
if err != nil {
return new(provider_util.Empty), err
}

if p.BasePath == nil {
return new(provider_util.Empty), errors.New("BasePath not set. Did you forget to call Initialize?")
}

err = os.RemoveAll(p.getProjectPath(*p.BasePath, projectReq.Project))
if err != nil {
return new(provider_util.Empty), err
}

return new(provider_util.Empty), nil
return new(provider_util.Empty), dockerClient.DestroyProject(projectReq.Project)
}

func (p DockerProvider) GetProjectInfo(projectReq *provider.ProjectRequest) (*workspace.ProjectInfo, error) {
client, err := p.getClient(projectReq.TargetOptions)
dockerClient, err := p.getClient(projectReq.TargetOptions)
if err != nil {
return nil, err
}

isRunning := true
info, err := util.GetContainerInfo(client, projectReq.Project)
if err != nil {
if docker_client.IsErrNotFound(err) {
log.Debug("Container not found, project is not running")
isRunning = false
} else {
return nil, err
}
}

if info == nil || info.State == nil {
return &workspace.ProjectInfo{
Name: projectReq.Project.Name,
IsRunning: isRunning,
Created: "",
ProviderMetadata: "{\"state\": \"container not found\"}",
}, nil
}

projectInfo := &workspace.ProjectInfo{
Name: projectReq.Project.Name,
IsRunning: isRunning,
Created: info.Created,
}

if info.Config != nil && info.Config.Labels != nil {
metadata, err := json.Marshal(info.Config.Labels)
if err != nil {
return nil, err
}
projectInfo.ProviderMetadata = string(metadata)
} else {
log.Warn("Could not get container labels for project: ", projectReq.Project.Name)
}

return projectInfo, nil
return dockerClient.GetProjectInfo(projectReq.Project)
}

func (p DockerProvider) getWorkspaceMetadata(workspaceReq *provider.WorkspaceRequest) (string, error) {
metadata := provider_types.WorkspaceMetadata{
NetworkId: workspaceReq.Workspace.Id,
}

jsonContent, err := json.Marshal(metadata)
func (p DockerProvider) getClient(targetOptionsJson string) (docker.IDockerClient, error) {
targetOptions, err := provider_types.ParseTargetOptions(targetOptionsJson)
if err != nil {
return "", err
return nil, err
}

return string(jsonContent), nil
}

func (p DockerProvider) getClient(targetOptionsJson string) (*docker_client.Client, error) {
targetOptions, err := provider_types.ParseTargetOptions(targetOptionsJson)
client, err := client.GetClient(*targetOptions, p.RemoteSockDir)
if err != nil {
return nil, err
}

return client.GetClient(*targetOptions, p.RemoteSockDir)
return docker.NewDockerClient(docker.DockerClientConfig{
ApiClient: client,
}), nil
}
Loading

0 comments on commit 024565e

Please sign in to comment.