Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

fix(eve): prune stale Docker sandbox templates and their Dockerfile images (#4312)

e0-gh-vercel-connect[bot]440b2f2291e5
diff --git a/.changeset/docker-template-prune.md b/.changeset/docker-template-prune.md
new file mode 100644
index 000000000..d71cdff7f
--- /dev/null
+++ b/.changeset/docker-template-prune.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Fix Docker sandbox template pruning so `eve dev` removes stale template images again, and drop the intermediate `eve-sandbox-dockerfile` image once its template is committed.
diff --git a/packages/eve/src/execution/sandbox/bindings/docker-templates.ts b/packages/eve/src/execution/sandbox/bindings/docker-templates.ts
index 947fde62c..50e1b5146 100644
--- a/packages/eve/src/execution/sandbox/bindings/docker-templates.ts
+++ b/packages/eve/src/execution/sandbox/bindings/docker-templates.ts
@@ -37,7 +37,9 @@ export async function pruneDockerSandboxTemplates(input: {
readonly retainCount?: number;
}): Promise<void> {
const cli = input.dockerCli ?? createDockerCli();
- const markersDirectory = resolveDockerTemplateMarkersDirectory(input.appRoot);
+ const markersDirectory = resolveDockerTemplateMarkersDirectory(
+ resolveSandboxCacheDirectory(input.appRoot),
+ );
let entries: Dirent<string>[];
try {
@@ -99,13 +101,13 @@ function dockerTemplateImageTag(input: {
}
export function resolveDockerTemplateMarkerPath(
- appRoot: string,
+ storagePath: string,
input: {
readonly optionsHash: string;
readonly templateKey: string;
},
): string {
- return join(resolveDockerTemplateMarkersDirectory(appRoot), dockerTemplateImageTag(input));
+ return join(resolveDockerTemplateMarkersDirectory(storagePath), dockerTemplateImageTag(input));
}
export async function touchDockerTemplateMarker(
@@ -184,6 +186,6 @@ export async function ensureDockerBaseImage(
expectDockerSuccess(await cli.run(["pull", options.image]), `pull base image "${options.image}"`);
}
-function resolveDockerTemplateMarkersDirectory(appRoot: string): string {
- return join(resolveSandboxCacheDirectory(appRoot), "docker", "templates");
+function resolveDockerTemplateMarkersDirectory(storagePath: string): string {
+ return join(storagePath, "docker", "templates");
}
diff --git a/packages/eve/src/execution/sandbox/bindings/docker.integration.test.ts b/packages/eve/src/execution/sandbox/bindings/docker.integration.test.ts
index ac2931ea5..cf026efdb 100644
--- a/packages/eve/src/execution/sandbox/bindings/docker.integration.test.ts
+++ b/packages/eve/src/execution/sandbox/bindings/docker.integration.test.ts
@@ -9,7 +9,10 @@ import {
type DockerCommandResult,
type DockerProcess,
} from "#execution/sandbox/bindings/docker-cli.js";
-import { createDockerSandboxProvider } from "#execution/sandbox/bindings/docker.js";
+import {
+ createDockerSandboxProvider,
+ pruneDockerSandboxTemplates,
+} from "#execution/sandbox/bindings/docker.js";
import { EVE_DEVELOPMENT_SANDBOX_RUN_ID_ENV } from "#execution/sandbox/development-run.js";
import {
createDockerSandboxOptionsHash,
@@ -26,6 +29,10 @@ import { createSandboxProviderHarness } from "#internal/testing/sandbox-provider
import { useTemporaryDirectories } from "#internal/testing/use-temporary-app-roots.js";
import { bufferToStream } from "#execution/sandbox/stream-utils.js";
import { createSandboxProviderIdentity } from "#execution/sandbox/provider-identity.js";
+import { createSandboxProviderFiles } from "#execution/sandbox/provider-files.js";
+import { createSandboxProviderHost } from "#execution/sandbox/provider-host.js";
+import { resolveSandboxCacheDirectory } from "#internal/application/paths.js";
+import { createSandboxProviderResources } from "#shared/sandbox-provider.js";
const createScratchDirectory = useTemporaryDirectories();
@@ -718,3 +725,68 @@ describe("Docker provider create", () => {
);
});
});
+
+describe("Docker template prune", () => {
+ function createImageStoreDockerCli() {
+ const images = new Set<string>();
+ const fake = createFakeDockerCli((args) => {
+ const reference = String(args.at(-1));
+ if (args[0] === "image" && args[1] === "inspect") {
+ return images.has(reference) ? undefined : { exitCode: 1, stderr: "No such image" };
+ }
+ if (args[0] === "build") images.add(args[args.indexOf("--tag") + 1]!);
+ if (args[0] === "pull" || args[0] === "commit") images.add(reference);
+ if (args[0] === "rmi" && !images.delete(reference)) {
+ return { exitCode: 1, stderr: `No such image: ${reference}` };
+ }
+ return undefined;
+ });
+ return { ...fake, images };
+ }
+
+ // Mirrors how prewarm and session start build the provider context.
+ async function prepareLikeDevelopment(appRoot: string, cli: DockerCli) {
+ return await createDockerSandboxProvider(undefined, cli).prepare({
+ files: createSandboxProviderFiles(join(appRoot, "sandbox")),
+ host: createSandboxProviderHost(appRoot),
+ resources: createSandboxProviderResources({}),
+ sourceRevision: "test-source-revision",
+ storagePath: resolveSandboxCacheDirectory(appRoot),
+ });
+ }
+
+ async function pruneEverything(appRoot: string, cli: DockerCli) {
+ await pruneDockerSandboxTemplates({
+ appRoot,
+ dockerCli: cli,
+ now: Date.now() + 60_000,
+ recentWindowMs: 0,
+ retainCount: 0,
+ });
+ }
+
+ it("removes a stale template image that prepare recorded", async () => {
+ const appRoot = await createScratchDirectory("eve-docker-prune-");
+ const { cli, images } = createImageStoreDockerCli();
+
+ const { imageReference } = await prepareLikeDevelopment(appRoot, cli);
+ expect(images).toContain(imageReference);
+
+ await pruneEverything(appRoot, cli);
+
+ expect(images).not.toContain(imageReference);
+ });
+
+ it("removes the Dockerfile image a stale template was built from", async () => {
+ const appRoot = await createScratchDirectory("eve-docker-prune-");
+ const { calls, cli, images } = createImageStoreDockerCli();
+ await mkdir(join(appRoot, "sandbox"), { recursive: true });
+ await writeFile(join(appRoot, "sandbox", "Dockerfile"), "FROM node:24\n");
+
+ await prepareLikeDevelopment(appRoot, cli);
+ await pruneEverything(appRoot, cli);
+
+ expect(findCall(calls, (args) => args[0] === "build")).toBeDefined();
+ expect([...images].filter((image) => image.startsWith("eve-sandbox-dockerfile:"))).toEqual([]);
+ });
+});
diff --git a/packages/eve/src/execution/sandbox/bindings/docker.ts b/packages/eve/src/execution/sandbox/bindings/docker.ts
index f145c32e1..4790efadc 100644
--- a/packages/eve/src/execution/sandbox/bindings/docker.ts
+++ b/packages/eve/src/execution/sandbox/bindings/docker.ts
@@ -307,6 +307,11 @@ export function createDockerSandboxProvider(
await touchDockerTemplateMarker(markerPath, imageReference);
} finally {
await cli.run(["rm", "-f", buildContainerName]).catch(() => {});
+ // The Dockerfile image only seeds this build; the committed
+ // template keeps its layers, and pruning the template frees them.
+ if (dockerfile !== undefined) {
+ await cli.run(["rmi", baseImage]).catch(() => {});
+ }
}
return { imageReference };