fix(docker): never exit the server unless something is known to restart it

#373 restarts the Compose container by exiting the server, which is right for
the shipped deployment: `restart: unless-stopped` relaunches it. The updater
verified that policy through the Docker socket and, when it could not (no
socket mounted), failed open and exited anyway. Failing open is the correct
choice for the GATE, where refusing would block every install without a
socket, but not for the kill: a container the daemon does not restart goes
down for good, with no UI left to recover it from. That is exactly the case a
plain `docker run` of this image without `--restart` produces, and the image
sets CODEMAN_IN_CONTAINER=1 itself, so it takes the container path.

The decision now happens server-side, where both the socket and the Compose
env are reachable, and rides down to the script as `--restart-by-exit 0|1`.
It is 1 when the Compose file declared `CODEMAN_RESTART_BY_EXIT=1` (added there
and only there, since that file is what sets the restart policy; the image ENV
deliberately does not) or when the daemon confirmed an auto-restart policy.
Otherwise the build still lands, the status becomes
`completed-needs-manual-restart` with the `docker restart` hint, and the
server keeps running. The shipped deployment is unchanged in effect: with the
socket it was already confirmed, and without it the declaration now covers it.

Also: a root-run `Start-Codeman.sh` (common on Unraid) created the
fingerprint baseline's `.codeman` directory before the container's first start
and left it root-owned, which the unprivileged server could then never write
its own state into. It is chowned to PUID:PGID when running as root.

Verified with a real image build of the merged tree (classic builder; this
box's BuildKit lacks buildx): runs as uid 1000, tsc/esbuild and the toolchain
present, the four CLIs at their pins, docker/.env absent, and `docker inspect
$HOSTNAME` returns the restart policy through the mounted socket as that user.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Qg6bcATm1pNNY4kQWGwzgu
This commit is contained in:
Codeman maintainer
2026-09-04 14:36:35 +02:00
parent 823f56a243
commit 99ad9cb236
7 changed files with 91 additions and 4 deletions
+28 -2
View File
@@ -271,6 +271,25 @@ export function isAutoRestartPolicy(name: string | null | undefined): boolean {
return name === 'always' || name === 'unless-stopped' || name === 'on-failure';
}
/**
* PURE: may the container updater restart the server by exiting? Yes when the
* Compose file declared it (`CODEMAN_RESTART_BY_EXIT=1`, set only there, since
* that file is what sets `restart: unless-stopped`) or when the daemon reports an
* auto-restart policy. Otherwise the answer is NO, and the updater stages the
* build and asks for a manual restart instead of exiting: an unknown policy is
* fine to fail open in the GATE (refusing would block installs with no socket),
* but the kill itself must not fail open, or a container the daemon would not
* bring back goes down with no UI left to recover it from.
*/
export function shouldRestartByExit(declared: boolean, restartPolicy: string | null): boolean {
return declared || isAutoRestartPolicy(restartPolicy);
}
/** The Compose file's declaration that exiting relaunches this container. */
export function restartByExitDeclared(): boolean {
return process.env.CODEMAN_RESTART_BY_EXIT === '1';
}
export interface EnvironmentGateInput {
/** sha256 of `docker/server.Dockerfile` the running container was built from. */
appliedDockerfileHash: string | null;
@@ -845,11 +864,18 @@ export async function startUpdate(): Promise<StartUpdateResult> {
process.execPath,
'--log',
logFile,
// For the launchd-daemon restart path: the updater kills this PID and the
// KeepAlive daemon respawns the server on the freshly built dist/.
// For the launchd-daemon and docker-compose restart paths: the updater kills
// this PID and the supervisor (KeepAlive daemon / Docker restart policy)
// respawns the server on the freshly built dist/.
'--server-pid',
String(process.pid),
];
if (info.supervisor === 'docker-compose') {
// Decided HERE, where the Docker socket and the Compose env are reachable;
// the updater only reads the answer. Without a yes it never exits the server.
const byExit = shouldRestartByExit(restartByExitDeclared(), detectOwnRestartPolicy());
args.push('--restart-by-exit', byExit ? '1' : '0');
}
if (prevSha) args.push('--prev-sha', prevSha);
if (info.dirty) args.push('--stash');