Skip to content

fix(sandbox): install docker-cli and add container DNS fallback routing for local sandboxes #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elf-mouse wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −9
Open

fix(sandbox): install docker-cli and add container DNS fallback routing for local sandboxes #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion deploy/core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM node:24-alpine@sha256:a0b9bf06e4e6193cf7a0f58816cc935ff8c2a908f81e6f1a95432d679c54fbfd

RUN apk add --no-cache ca-certificates curl git git-daemon
RUN apk add --no-cache ca-certificates curl git git-daemon docker-cli

WORKDIR /app

Expand Down
30 changes: 22 additions & 8 deletions src/sandbox/local-sandbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,28 @@ export function createLocalSandbox(workspace: WorkspaceStore, opts: LocalSandbox
timeoutMs?: number,
signal?: AbortSignal,
): Promise<{ status: number; text: string }> {
const port = await resolvePort(name);
const signals = [AbortSignal.timeout(timeoutMs ?? 30_000), ...(signal ? [signal] : [])];
const res = await fetchImpl(`http://127.0.0.1:${port}${path}`, {
method: body === undefined ? "GET" : "POST",
...(body === undefined ? {} : { body: JSON.stringify(body), headers: { "content-type": "application/json" } }),
signal: AbortSignal.any(signals),
});
return { status: res.status, text: await res.text() };
const port = await resolvePort(name).catch(() => null);
const targets: string[] = [];
if (port) {
targets.push(`http://127.0.0.1:${port}`);
targets.push(`http://host.docker.internal:${port}`);
}
targets.push(`http://${name}:${AGENT_PORT}`);
let lastErr: unknown;
for (const base of targets) {
try {
const signals = [AbortSignal.timeout(timeoutMs ?? 5000), ...(signal ? [signal] : [])];
const res = await fetchImpl(`${base}${path}`, {
method: body === undefined ? "GET" : "POST",
...(body === undefined ? {} : { body: JSON.stringify(body), headers: { "content-type": "application/json" } }),
signal: AbortSignal.any(signals),
});
return { status: res.status, text: await res.text() };
} catch (e) {
lastErr = e;
}
}
throw lastErr ?? new Error(`local sandbox ${name}: unreachable`);
}

async function waitDaemon(name: string): Promise<void> {
Expand Down