Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1604dde
feat(provider): prepare Docker Sandboxes machine support
skevetter Nov 2, 2026
a72a1af
fix(provider): satisfy cancellation and Docker policy checks
skevetter Nov 2, 2026
f4d4495
fix(provider): preserve builtin Docker installation behavior
skevetter Nov 2, 2026
733bc23
fix(provider): migrate saved builtin Docker install policy
skevetter Nov 3, 2026
8768ba2
fix(provider): validate policies and inherit file-mode environment
skevetter Nov 3, 2026
5989ce6
fix(provider): supervise file cancellation for shell commands
skevetter Nov 3, 2026
9675a28
fix(provider): guard unreleased sandbox UI and stdin drain
skevetter Nov 3, 2026
88efca5
fix(provider): reap background shell children on completion
skevetter Nov 3, 2026
e4a307c
fix(provider): preserve foreground signals in supervised shell
skevetter Nov 3, 2026
0d436d5
refactor(provider): split Windows ACL validation
skevetter Nov 3, 2026
94d833e
fix(provider): acknowledge cleaned shell parse failures
skevetter Nov 3, 2026
dfa6432
fix(provider): preserve local Docker install policy
skevetter Nov 3, 2026
201756e
fix(provider): preserve built-in Docker installation
skevetter Nov 3, 2026
60516d9
docs(provider): use workspace up command
skevetter Nov 3, 2026
066a3e4
fix(provider): qualify unreleased installation guidance
skevetter Nov 3, 2026
ec4426f
fix(provider): join argv transport input after exit
skevetter Nov 3, 2026
d283ebb
test(provider): reject timed-out init replacement
skevetter Nov 3, 2026
83bce89
fix(provider): bypass recovery gate for cleanup helper
skevetter Nov 3, 2026
a0a7a41
docs(provider): clarify shell arrays and child lifetime
skevetter Nov 4, 2026
1b64e1c
docs(provider): scope command and output stream requirements
skevetter Nov 4, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 57 additions & 8 deletions cmd/internal/agentworkspace/docker_darwin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,28 @@
package agentworkspace

import (
"context"
"errors"
"os"
"path/filepath"
"slices"
"strings"
"testing"

"github.com/devsy-org/devsy/pkg/provider"
"github.com/devsy-org/devsy/pkg/types"
)

func writeExecutable(t *testing.T, path string) {
t.Helper()
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
t.Fatal(err)
}
executable, err := os.Executable()
if err != nil {
t.Fatal(err)
}
if err := os.WriteFile(path, []byte("#!/bin/sh\n"), 0o755); err != nil {
if err := os.Link(executable, path); err != nil {
t.Fatal(err)
}
}
Expand Down Expand Up @@ -88,27 +97,67 @@ func TestFindDarwinDockerCLIHomeFailureDoesNotBreakStaticDiscovery(t *testing.T)

func TestFindDarwinDockerCLIRejectsNonExecutable(t *testing.T) {
path := filepath.Join(t.TempDir(), "docker")
if err := os.WriteFile(path, nil, 0o644); err != nil {
if err := os.WriteFile(path, nil, 0o600); err != nil {
t.Fatal(err)
}
if _, err := findDarwinDockerCLIInPaths([]string{path}); err == nil {
t.Fatal("expected non-executable candidate to be rejected")
}
}

func TestFindDarwinDockerCLIRejectsInaccessibleCandidate(t *testing.T) {
func TestFindDarwinDockerCLISkipsBrokenCandidate(t *testing.T) {
tmp := t.TempDir()
inaccessible := filepath.Join(tmp, "inaccessible", "docker")
writeExecutable(t, inaccessible)
if err := os.Chmod(inaccessible, 0o001); err != nil {
broken := filepath.Join(tmp, "broken", "docker")
if err := os.MkdirAll(filepath.Dir(broken), 0o700); err != nil {
t.Fatal(err)
}
if err := os.Symlink(filepath.Join(tmp, "missing", "docker"), broken); err != nil {
t.Fatal(err)
}

valid := filepath.Join(tmp, "valid", "docker")
writeExecutable(t, valid)

path, err := findDarwinDockerCLIInPaths([]string{inaccessible, valid})
path, err := findDarwinDockerCLIInPaths([]string{broken, valid})
if err != nil || path != valid {
t.Fatalf("expected fallback to valid candidate %q, got %q (err: %v)", valid, path, err)
}
}

func TestDarwinDockerDiscoveryPrecedesDisabledInstallation(t *testing.T) {
t.Setenv("PATH", t.TempDir())
existing := filepath.Join(t.TempDir(), "docker")
writeExecutable(t, existing)
info := &provider.AgentWorkspaceInfo{}
info.Agent.Docker.Install = types.StrBool("false")
calls := 0
initializer := &workspaceInitializer{
workspaceInfo: info,
findDarwinDocker: func() (string, error) {
calls++
return findDarwinDockerCLIInPaths([]string{existing})
},
installDocker: func(context.Context) (string, error) {
t.Fatal("disabled installation called the installer")
return "", nil
},
}
path, err := initializer.ensureDockerInstalled(context.Background())
if err != nil || path != existing || calls != 1 {
t.Fatalf(
"Docker CLI discovery = %q, %v, calls %d; want %q, nil, 1",
path,
err,
calls,
existing,
)
}

initializer.findDarwinDocker = func() (string, error) {
return "", errors.New("Docker CLI absent")
}
path, err = initializer.ensureDockerInstalled(context.Background())
if path != "" || err == nil || !strings.Contains(err.Error(), "agent.docker.install is false") {
t.Fatalf("missing Docker CLI = %q, %v; want disabled installation error", path, err)
}
}
76 changes: 65 additions & 11 deletions cmd/internal/agentworkspace/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,9 @@ type workspaceInitializer struct {
logger tunnelserver.Logger
dockerCredentialsDir string
gitCredentialsHelper string
installDocker func(context.Context) (string, error)
findDarwinDocker func() (string, error)
configureDocker func(context.Context) error
}

type initWorkspaceParams struct {
Expand All @@ -411,6 +414,10 @@ func initWorkspace(
}

func (w *workspaceInitializer) initialize(ctx context.Context) error {
if err := w.validateDockerManagement(); err != nil {
return err
}

if err := w.initializeTunnel(ctx); err != nil {
return err
}
Expand Down Expand Up @@ -448,7 +455,11 @@ func (w *workspaceInitializer) tryConfigureDockerDaemon(ctx context.Context) {
log.Debug("skipping configuring docker daemon")
return
}
if err := configureDockerDaemon(ctx); err != nil {
configure := w.configureDocker
if configure == nil {
configure = configureDockerDaemon
}
if err := configure(ctx); err != nil {
log.Warn(
"could not find docker daemon config file, if using the registry cache, " +
"ensure the daemon is configured with containerd-snapshotter=true, " +
Expand Down Expand Up @@ -514,25 +525,49 @@ func (w *workspaceInitializer) ensureDockerInstalled(ctx context.Context) (strin
}

if dockerCmd != docker {
path, err := exec.LookPath(dockerCmd)
if err != nil {
return "", fmt.Errorf("custom docker path %q not found: %w", dockerCmd, err)
}
return path, nil
return findCustomDockerCLI(dockerCmd)
}

if dockerCmd == docker && runtime.GOOS == "darwin" {
return findDarwinDockerCLI()
if runtime.GOOS == "darwin" {
path, err := w.discoverDarwinDockerCLI()
if err == nil || !w.isDockerInstallDisabled() {
return path, err
}
}

if w.isDockerInstallDisabled() {
log.Debug(
"docker not found but installation was disabled, installing anyway as it is required",
return "", fmt.Errorf(
"docker CLI is unavailable and agent.docker.install is false (executable %q)",
dockerCmd,
)
Comment thread
skevetter marked this conversation as resolved.
Resolved
}

return w.installMissingDocker(ctx)
}

func findCustomDockerCLI(dockerCmd string) (string, error) {
path, err := exec.LookPath(dockerCmd)
if err != nil {
return "", fmt.Errorf("custom docker path %q not found: %w", dockerCmd, err)
}
return path, nil
}

func (w *workspaceInitializer) discoverDarwinDockerCLI() (string, error) {
find := w.findDarwinDocker
if find == nil {
find = findDarwinDockerCLI
}
return find()
}

func (w *workspaceInitializer) installMissingDocker(ctx context.Context) (string, error) {
log.Debug("attempting to install docker")
dockerPath, err := installDocker(ctx)
install := w.installDocker
if install == nil {
install = installDocker
}
dockerPath, err := install(ctx)
log.Debugf("docker installation path=%q, err=%v", dockerPath, err)
return dockerPath, err
}
Expand Down Expand Up @@ -579,6 +614,9 @@ func (w *workspaceInitializer) getDockerCommand() string {
}

func (w *workspaceInitializer) isDockerInstallDisabled() bool {
if w.workspaceInfo.Agent.Docker.Install == "" {
return false
}
install, err := w.workspaceInfo.Agent.Docker.Install.Bool()
return err == nil && !install
}
Expand Down Expand Up @@ -612,10 +650,26 @@ func (w *workspaceInitializer) waitForDocker(resultChan <-chan dockerInstallResu
return nil
}

func (w *workspaceInitializer) validateDockerManagement() error {
if _, err := w.workspaceInfo.Agent.Docker.Install.Bool(); err != nil {
return fmt.Errorf("agent.docker.install: %w", err)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
}
if _, err := w.workspaceInfo.Agent.Docker.ConfigureDaemon.Bool(); err != nil {
return fmt.Errorf("agent.docker.configureDaemon: %w", err)
}
return nil
}

func (w *workspaceInitializer) shouldConfigureDockerDaemon() bool {
if !w.workspaceInfo.Agent.IsDockerDriver() {
return false
}
if w.workspaceInfo.Agent.Docker.ConfigureDaemon != "" {
configure, err := w.workspaceInfo.Agent.Docker.ConfigureDaemon.Bool()
if err != nil || !configure {
return false
}
}

local, err := w.workspaceInfo.Agent.Local.Bool()
if err != nil {
Expand Down
Loading
Loading