From 24f7c6a655ff7133ee74e1e7c5011978d3678d26 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Mon, 17 Aug 2026 23:59:26 +0000 Subject: [PATCH] fix(docker): stop running container before removing it in DeleteDevContainer podman/docker refuse to `rm` a running container. The Apple and microsandbox drivers already stop before removing; the docker driver skipped this, so a workspace left running after an aborted tunnel (e.g. a killed exec session) failed to delete and leaked, cascading into resource contention and cascading timeouts in up-provider-podman-rootful-features CI runs. Mirrors the Apple driver's forgiving pattern: a stop failure is logged but removal is still attempted. --- pkg/driver/docker/lifecycle.go | 15 ++++++++----- pkg/driver/docker/lifecycle_test.go | 34 ++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/pkg/driver/docker/lifecycle.go b/pkg/driver/docker/lifecycle.go index 5501828474..0713733b1f 100644 --- a/pkg/driver/docker/lifecycle.go +++ b/pkg/driver/docker/lifecycle.go @@ -17,6 +17,8 @@ import ( const containerRestartAttempts = 3 +const containerStatusRunning = "running" + // snapshotImageLabel marks a committed image as a devsy workspace snapshot, // so it's identifiable via `docker inspect`/`docker images --filter` by // anyone who pulls or lists it outside `devsy snapshot` tooling — the @@ -72,7 +74,7 @@ func (d *dockerDriver) ensureContainerRunning( status, ) } - if status == "running" { + if status == containerStatusRunning { return nil } @@ -189,6 +191,8 @@ func (d *dockerDriver) CommitContainer(ctx context.Context, workspaceID, tag str return nil } +// DeleteDevContainer stops a still-running container before removing it, +// since podman/docker refuse to `rm` a running container. func (d *dockerDriver) DeleteDevContainer(ctx context.Context, workspaceId string) error { container, err := d.FindDevContainer(ctx, workspaceId) if err != nil { @@ -197,12 +201,13 @@ func (d *dockerDriver) DeleteDevContainer(ctx context.Context, workspaceId strin return nil } - err = d.Docker.Remove(ctx, container.ID) - if err != nil { - return err + if strings.ToLower(container.State.Status) == containerStatusRunning { + if err := d.Docker.Stop(ctx, container.ID); err != nil { + log.Warnf("stop before delete failed for %s: %v", container.ID, err) + } } - return nil + return d.Docker.Remove(ctx, container.ID) } func (d *dockerDriver) StartDevContainer(ctx context.Context, workspaceId string) error { diff --git a/pkg/driver/docker/lifecycle_test.go b/pkg/driver/docker/lifecycle_test.go index a13942d6c9..ecacf85998 100644 --- a/pkg/driver/docker/lifecycle_test.go +++ b/pkg/driver/docker/lifecycle_test.go @@ -203,7 +203,7 @@ func TestEnsureContainerRunning_AlreadyRunning(t *testing.T) { d := &dockerDriver{Docker: &docker.DockerHelper{DockerCommand: testDockerCmd}} container := &config.ContainerDetails{ ID: "c1", - State: config.ContainerDetailsState{Status: "running"}, + State: config.ContainerDetailsState{Status: containerStatusRunning}, } require.NoError(t, d.ensureContainerRunning(context.Background(), container)) @@ -326,3 +326,35 @@ esac require.Error(t, err) assert.ErrorIs(t, err, context.Canceled) } + +func TestDeleteDevContainer_StopsRunningContainerBeforeRemove(t *testing.T) { + dir := t.TempDir() + calls := filepath.Join(dir, "calls") + script := `#!/bin/sh +echo "$1" >> "` + calls + `" +case "$1" in + inspect) + echo '[{"ID":"c1","State":{"Status":"running"}}]' + ;; + stop) ;; + rm) + if ! grep -q '^stop$' "` + calls + `"; then + echo "cannot remove running container" >&2 + exit 1 + fi + ;; +esac +` + bin := filepath.Join(dir, "docker-fake") + require.NoError(t, os.WriteFile(bin, []byte(script), 0o755)) //nolint:gosec + + d := &dockerDriver{Docker: &docker.DockerHelper{DockerCommand: bin, ContainerID: "c1"}} + + err := d.DeleteDevContainer(context.Background(), "ws1") + require.NoError(t, err) + + logged, readErr := os.ReadFile(calls) //nolint:gosec // G304: test-controlled path + require.NoError(t, readErr) + assert.Contains(t, string(logged), "stop\n") + assert.Contains(t, string(logged), "rm\n") +}