Skip to content

Commit

Permalink
feat: update daytona to v0.46.0 (#13)
Browse files Browse the repository at this point in the history
Signed-off-by: Toma Puljak <[email protected]>
  • Loading branch information
Tpuljak authored Nov 22, 2024
1 parent 913ff0d commit 5432051
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replace github.com/docker/go-connections => github.com/docker/go-connections v0.

require (
github.com/aws/aws-sdk-go v1.54.19
github.com/daytonaio/daytona v0.44.1
github.com/daytonaio/daytona v0.46.0
github.com/docker/docker v27.2.0+incompatible
github.com/google/uuid v1.6.0
github.com/hashicorp/go-hclog v1.6.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -726,8 +726,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454WvHn0=
github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE=
github.com/daytonaio/daytona v0.44.1 h1:X0R82LYm4rcL79WGWkf1W/1kMfOt81f7AJ7r1a2awBI=
github.com/daytonaio/daytona v0.44.1/go.mod h1:ar2OwOz0XhZIk9ZWWGfqrT1iE3c0eJWAdMykISsCpAE=
github.com/daytonaio/daytona v0.46.0 h1:sR6uolEABmPvKjgfeZqet1syU1p7S5pvBoOLtbXODtI=
github.com/daytonaio/daytona v0.46.0/go.mod h1:MIhlJ/RVENh/Zfz0rGrQRYhkSMFzw6I/WIwZbuEilIs=
github.com/dblohm7/wingoes v0.0.0-20240123200102-b75a8a7d7eb0 h1:vrC07UZcgPzu/OjWsmQKMGg3LoPSz9jh/pQXIrHjUj4=
github.com/dblohm7/wingoes v0.0.0-20240123200102-b75a8a7d7eb0/go.mod h1:Nx87SkVqTKd8UtT+xu7sM/l+LgXs6c0aHrlKusR+2EQ=
github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e h1:vUmf0yezR0y7jJ5pceLHthLaYf4bA5T14B6q39S4q2Q=
Expand Down
28 changes: 16 additions & 12 deletions pkg/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,14 @@ func (a *AWSProvider) CreateProject(projectReq *provider.ProjectRequest) (*util.
defer sshClient.Close()

return new(util.Empty), dockerClient.CreateProject(&docker.CreateProjectOptions{
Project: projectReq.Project,
ProjectDir: getProjectDir(projectReq),
Cr: projectReq.ContainerRegistry,
LogWriter: logWriter,
Gpc: projectReq.GitProviderConfig,
SshClient: sshClient,
Project: projectReq.Project,
ProjectDir: getProjectDir(projectReq),
ContainerRegistry: projectReq.ContainerRegistry,
BuilderImage: projectReq.BuilderImage,
BuilderContainerRegistry: projectReq.BuilderContainerRegistry,
LogWriter: logWriter,
Gpc: projectReq.GitProviderConfig,
SshClient: sshClient,
})
}

Expand Down Expand Up @@ -249,12 +251,14 @@ func (a *AWSProvider) StartProject(projectReq *provider.ProjectRequest) (*util.E
defer sshClient.Close()

return new(util.Empty), dockerClient.StartProject(&docker.CreateProjectOptions{
Project: projectReq.Project,
ProjectDir: getProjectDir(projectReq),
Cr: projectReq.ContainerRegistry,
LogWriter: logWriter,
Gpc: projectReq.GitProviderConfig,
SshClient: sshClient,
Project: projectReq.Project,
ProjectDir: getProjectDir(projectReq),
ContainerRegistry: projectReq.ContainerRegistry,
BuilderImage: projectReq.BuilderImage,
BuilderContainerRegistry: projectReq.BuilderContainerRegistry,
LogWriter: logWriter,
Gpc: projectReq.GitProviderConfig,
SshClient: sshClient,
}, *a.DaytonaDownloadUrl)
}

Expand Down

0 comments on commit 5432051

Please sign in to comment.