Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

fix: warn at boot when the docker deploy provider has no daemon

Joshua France7d91f189a096
diff --git a/src/deploy/docker-deploy-provider.ts b/src/deploy/docker-deploy-provider.ts
index 51615b071..4aa911eac 100644
--- a/src/deploy/docker-deploy-provider.ts
+++ b/src/deploy/docker-deploy-provider.ts
@@ -1,9 +1,11 @@
import type { Deployment, DeploymentVersion } from "./deploy-store.ts";
import type { DeployEndpoint, DeployProvider } from "./deploy-provider.ts";
import { spawnDockerExec, type DockerExec } from "../sandbox/docker-exec.ts";
+import { errMessage } from "../util/errors.ts";
const APP_PORT = 8080;
const LEGACY_NETWORK = "agent-deploynet";
+const DAEMON_PROBE_TIMEOUT_MS = 10_000;
export interface DockerDeployProviderOptions {
image?: string;
@@ -12,6 +14,16 @@ export interface DockerDeployProviderOptions {
dockerExec?: DockerExec;
}
+export async function dockerDaemonUnreachable(opts: DockerDeployProviderOptions = {}): Promise<string | null> {
+ const dexec = opts.dockerExec ?? spawnDockerExec(opts.docker ?? "docker");
+ try {
+ const r = await dexec(["version", "-f", "{{.Server.Version}}"], DAEMON_PROBE_TIMEOUT_MS);
+ return r.code === 0 ? null : r.stderr.trim() || `exit ${r.code}`;
+ } catch (e) {
+ return errMessage(e);
+ }
+}
+
export function createDockerDeployProvider(opts: DockerDeployProviderOptions = {}): DeployProvider {
const docker = opts.docker ?? "docker";
const image = opts.image ?? "node:24-alpine";
diff --git a/src/wiring.ts b/src/wiring.ts
index 181cd9fcb..72f26eec1 100644
--- a/src/wiring.ts
+++ b/src/wiring.ts
@@ -82,7 +82,7 @@ import { createPgBossCronQueue } from "./cron/job-queue.ts";
import { createWebhookStore, disableLegacyWebhookRows } from "./webhooks/webhook-store.ts";
import { createWebhookReceiver, type WebhookReceiver } from "./webhooks/webhook-receiver.ts";
import { createDeployStore, type Deployment } from "./deploy/deploy-store.ts";
-import { createDockerDeployProvider } from "./deploy/docker-deploy-provider.ts";
+import { createDockerDeployProvider, dockerDaemonUnreachable } from "./deploy/docker-deploy-provider.ts";
import { createAwsDeployProvider, type StoredDeployBody } from "./deploy/aws-deploy-provider.ts";
import { createFlyDeployProvider } from "./deploy/fly-deploy-provider.ts";
import type { DeployProvider } from "./deploy/deploy-provider.ts";
@@ -992,6 +992,14 @@ export function buildApp(
if (config.deployProvider === "fly") return createFlyDeployProvider(config.flyDeploy);
return createDockerDeployProvider();
})();
+ if (config.deployProvider === "docker") {
+ void dockerDaemonUnreachable().then((reason) => {
+ if (reason)
+ console.warn(
+ `[wiring] docker deploy: DEPLOY_PROVIDER is docker (the default when unset) but no Docker daemon is reachable from core (${reason}) — every publish will fail until a daemon is reachable or DEPLOY_PROVIDER selects fly or aws`,
+ );
+ });
+ }
if (config.deployProvider === "aws" && !config.awsDeploy.dataBucket && !config.awsSandbox.s3Bucket) {
console.warn(
"[wiring] aws deploy: no data bucket resolved (AWS_DEPLOY_DATA_BUCKET unset, sandbox is not aws) — deployed apps have NO durable /data",
diff --git a/test/docker-deploy-provider.test.ts b/test/docker-deploy-provider.test.ts
index e760bdf12..1056d6921 100644
--- a/test/docker-deploy-provider.test.ts
+++ b/test/docker-deploy-provider.test.ts
@@ -1,6 +1,6 @@
import assert from "node:assert/strict";
import { test } from "node:test";
-import { createDockerDeployProvider } from "../src/deploy/docker-deploy-provider.ts";
+import { createDockerDeployProvider, dockerDaemonUnreachable } from "../src/deploy/docker-deploy-provider.ts";
import { createDeployStore } from "../src/deploy/deploy-store.ts";
import type { DockerExec } from "../src/sandbox/docker-exec.ts";
import { scopeId } from "../src/types.ts";
@@ -144,3 +144,41 @@ test("a transient target inspection failure does not report the deployment missi
await assert.rejects(provider.resolveEndpoint!(running, running.versions[0]!), /daemon unavailable/);
});
+
+test("the daemon probe reports nothing when Docker answers", async () => {
+ const calls: string[][] = [];
+ const dockerExec: DockerExec = async (args) => {
+ calls.push(args);
+ return { code: 0, stdout: "29.1.3\n", stderr: "" };
+ };
+
+ assert.equal(await dockerDaemonUnreachable({ dockerExec }), null);
+ assert.deepEqual(calls, [["version", "-f", "{{.Server.Version}}"]]);
+});
+
+test("the daemon probe reports why Docker is unreachable", async () => {
+ const dockerExec: DockerExec = async () => ({
+ code: 1,
+ stdout: "",
+ stderr: "dial unix /var/run/docker.sock: connect: no such file or directory\n",
+ });
+
+ assert.equal(
+ await dockerDaemonUnreachable({ dockerExec }),
+ "dial unix /var/run/docker.sock: connect: no such file or directory",
+ );
+});
+
+test("the daemon probe reports a failed probe rather than throwing", async () => {
+ const dockerExec: DockerExec = async () => {
+ throw new Error("spawn docker ENOENT");
+ };
+
+ assert.equal(await dockerDaemonUnreachable({ dockerExec }), "spawn docker ENOENT");
+});
+
+test("the daemon probe reports the exit code when Docker is silent", async () => {
+ const dockerExec: DockerExec = async () => ({ code: 7, stdout: "", stderr: "" });
+
+ assert.equal(await dockerDaemonUnreachable({ dockerExec }), "exit 7");
+});