Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions src/lib/onboard/docker-gpu-patch.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,10 @@ describe("docker-gpu-patch", () => {
expect(args).toEqual(
expect.arrayContaining(["--env", "OPENSHELL_ENDPOINT=http://127.0.0.1:8080/"]),
);
expect(args).not.toEqual(
// --add-host writes to /etc/hosts (mount namespace), not the network
// stack, so it must survive even when --network=host is explicitly
// requested (#3562, #3568).
expect(args).toEqual(
expect.arrayContaining(["--add-host", "host.openshell.internal:172.17.0.1"]),
);
expect(args).not.toEqual(expect.arrayContaining(["--network-alias", "openshell-alpha"]));
Expand All @@ -226,7 +229,7 @@ describe("docker-gpu-patch", () => {
});

it("reports the Docker GPU patch network mode", () => {
expect(getDockerGpuPatchNetworkMode({})).toBe("host");
expect(getDockerGpuPatchNetworkMode({})).toBe("preserve");
expect(getDockerGpuPatchNetworkMode({ NEMOCLAW_DOCKER_GPU_PATCH_NETWORK: "host" })).toBe(
"host",
);
Expand Down Expand Up @@ -394,9 +397,11 @@ describe("docker-gpu-patch", () => {
"--security-opt",
"apparmor=unconfined",
"--network",
"host",
"openshell-docker",
"--add-host",
"host.openshell.internal:172.17.0.1",
"--env",
"OPENSHELL_ENDPOINT=http://127.0.0.1:8080/",
"OPENSHELL_ENDPOINT=http://host.openshell.internal:8080/",
]),
expect.objectContaining({ ignoreError: true }),
);
Expand Down
12 changes: 7 additions & 5 deletions src/lib/onboard/docker-gpu-patch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,9 @@ export function getDockerGpuPatchNetworkMode(
env: Record<string, string | undefined> = process.env,
): "host" | "preserve" {
const networkOverride = String(env[DOCKER_GPU_PATCH_NETWORK_ENV] || "").trim().toLowerCase();
if (networkOverride === "host") return "host";
if (networkOverride === "preserve" || networkOverride === "bridge") return "preserve";
if (networkOverride && networkOverride !== "host") return "preserve";
return "host";
return "preserve";
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

function dockerNetworkAliases(
Expand Down Expand Up @@ -449,9 +449,11 @@ export function buildDockerGpuCloneRunArgs(
securityOpt.add("apparmor=unconfined");
}
for (const opt of securityOpt) args.push("--security-opt", opt);
if (networkMode !== "host") {
for (const hostEntry of stringArray(host.ExtraHosts)) args.push("--add-host", hostEntry);
}
// --add-host writes to the container's /etc/hosts (mount namespace), not
// the network stack, so OpenShell's host.openshell.internal mapping must
// survive even when the caller explicitly opts into --network=host via
// NEMOCLAW_DOCKER_GPU_PATCH_NETWORK=host (#3562, #3568).
for (const hostEntry of stringArray(host.ExtraHosts)) args.push("--add-host", hostEntry);
for (const group of stringArray(host.GroupAdd)) args.push("--group-add", group);
if (networkMode !== "host") {
for (const dns of stringArray(host.Dns)) args.push("--dns", dns);
Expand Down
Loading