kennethnym/tesseract
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: ssh not proxied when workspace restarts

Browse Source
This commit is contained in:
Kenneth
2024-11-17 18:30:07 +00:00
parent 45bfbe093a
commit fb5e708fd8
3 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
internal/workspace/http_handlers.go
View File

@@ -11,7 +11,7 @@ import (
"net/http"
"strconv"
"sync"
docker2 "tesseract/internal/docker"
"tesseract/internal/docker"
"tesseract/internal/service"
"tesseract/internal/template"
"time"
@@ -42,7 +42,7 @@ func fetchAllWorkspaces(c echo.Context) error {
return c.JSON(http.StatusOK, make([]workspace, 0))
}
docker := service.DockerClient(c)
dockerClient := service.DockerClient(c)
sshProxy := service.SSHProxy(c)
var wg sync.WaitGroup
@@ -54,7 +54,7 @@ func fetchAllWorkspaces(c echo.Context) error {
go func() {
defer wg.Done()
inspect, err := docker.ContainerInspect(ctx, w.ContainerID)
inspect, err := dockerClient.ContainerInspect(ctx, w.ContainerID)
if err != nil {
mu.Lock()
errs = append(errs, err)
@@ -73,7 +73,7 @@ func fetchAllWorkspaces(c echo.Context) error {
workspaces[i].Status = statusUnknown
}
if internalPort := docker2.ContainerSSHHostPort(ctx, inspect); internalPort > 0 {
if internalPort := docker.ContainerSSHHostPort(ctx, inspect); internalPort > 0 {
if port := sshProxy.FindExternalPort(internalPort); port > 0 {
workspaces[i].SSHPort = port
}
@@ -120,20 +120,36 @@ func updateOrCreateWorkspace(c echo.Context) error {
return err
}
docker := service.DockerClient(c)
dockerClient := service.DockerClient(c)
sshProxy := service.SSHProxy(c)
switch status(body.Status) {
case statusStopped:
if err = stopContainer(ctx, docker, workspaceName); err != nil {
if err = stopContainer(ctx, dockerClient, workspaceName); err != nil {
return err
}
w.Status = statusStopped
break
case statusRunning:
if err = startContainer(ctx, docker, workspaceName); err != nil {
if err = startContainer(ctx, dockerClient, workspaceName); err != nil {
return err
}
inspect, err := dockerClient.ContainerInspect(ctx, w.ContainerID)
if err != nil {
return err
}
sshPort := docker.ContainerSSHHostPort(ctx, inspect)
if sshPort > 0 {
if err = sshProxy.NewProxyEntryTo(sshPort); err != nil {
return err
}
}
w.Status = statusRunning
break
}
@@ -165,7 +181,7 @@ func createWorkspace(c echo.Context, workspaceName string) error {
return err
}
docker := service.DockerClient(c)
dockerClient := service.DockerClient(c)
containerSSHPort := nat.Port("22/tcp")
containerConfig := &container.Config{
@@ -184,17 +200,17 @@ func createWorkspace(c echo.Context, workspaceName string) error {
},
}
res, err := docker.ContainerCreate(ctx, containerConfig, hostConfig, nil, nil, workspaceName)
res, err := dockerClient.ContainerCreate(ctx, containerConfig, hostConfig, nil, nil, workspaceName)
if err != nil {
return err
}
err = docker.ContainerStart(ctx, res.ID, container.StartOptions{})
err = dockerClient.ContainerStart(ctx, res.ID, container.StartOptions{})
if err != nil {
return err
}
inspect, err := docker.ContainerInspect(ctx, res.ID)
inspect, err := dockerClient.ContainerInspect(ctx, res.ID)
if err != nil {
return err
}
@@ -248,7 +264,7 @@ func deleteWorkspace(c echo.Context) error {
}
db := service.Database(c)
docker := service.DockerClient(c)
dockerClient := service.DockerClient(c)
ctx := c.Request().Context()
tx, err := db.BeginTx(ctx, nil)
@@ -262,20 +278,20 @@ func deleteWorkspace(c echo.Context) error {
return echo.NewHTTPError(http.StatusNotFound)
}
inspect, err := inspectContainer(ctx, docker, w.ContainerID)
inspect, err := inspectContainer(ctx, dockerClient, w.ContainerID)
if err != nil {
_ = tx.Rollback()
return err
}
if inspect.State.Running {
if err = stopContainer(ctx, docker, w.ContainerID); err != nil {
if err = stopContainer(ctx, dockerClient, w.ContainerID); err != nil {
_ = tx.Rollback()
return err
}
}
if err = deleteContainer(ctx, docker, w.ContainerID); err != nil {
if err = deleteContainer(ctx, dockerClient, w.ContainerID); err != nil {
return err
}