mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-10-05 15:09:42 +02:00
Merge pull request #349 from opticon454/feature/docker-compose
Docker Compose deployment: Codeman runs in a container and spawns Docker cases as SIBLING containers through the mounted host socket (Docker-outside-of-Docker). Resolved the README conflict (master had grown to eight CLIs since the branch was cut) and moved the Compose blurb out of the feature bullets into Quick Start, next to the other ways of starting Codeman. Three review findings from the PR discussion are fixed here rather than left for a follow-up, because two of them are shipped-image problems: - `.dockerignore` excluded `.env` only at the ROOT. A pattern is matched against the whole context-relative path, so `docker/.env` — which the deployment's own README tells the user to fill with CODEMAN_PASSWORD and provider API keys — was picked up by `COPY . .` and baked into the image at /opt/codeman/docker/.env. Verified in both directions against a real build context: with a canary secret in docker/.env, the unfixed ignore file lets /ctx/docker/.env through, and `**/.env` (plus `**/.env.*` and a negation for the checked-in .env.example) leaves only the example behind. - `CODEMAN_CASES_PATH` moved the server's CASES_DIR but not the CLI's, which still hardcoded ~/codeman-cases, so `codeman skill install --case <name>` reported "Case not found" on exactly the deployment the override exists for. Both now resolve through config/cases-dir.ts. state-store.ts keeps its own literal on purpose: that one migrates the historical ~/claudeman-cases directory by name and is about the old default, not the active location. - CLAUDE.md gained the Compose paragraph (the sibling-container inversion, the three env vars, the .dockerignore and root-owned-bind traps) and .dockerignore joins the documented list of files that genuinely belong in the repo root. The PR's `mode === 'claude'` guard on dockerResumeId is an unrelated master bug fix riding along: appendResumeFlag() maps a resume id onto codex/gemini/pi/grok/ deepseek/omp/antigravity and RESUME_ID_SAFE accepts a UUID, so a Docker case's lastClaudeSessionId was handed to every non-claude CLI. Full gate green in a merge worktree: 6360 tests, lint, format, frontend syntax, public assets, lockfile.
This commit is contained in:
@@ -19,6 +19,7 @@ import { homedir } from 'node:os';
|
||||
import { join } from 'node:path';
|
||||
import { dataPath } from '../src/config/instance.js';
|
||||
import { program, resolveCliCasePath, resolveSkillTargetPath } from '../src/cli.js';
|
||||
import { getCasesDir } from '../src/config/cases-dir.js';
|
||||
|
||||
const LINKED_CASES_FILE = dataPath('linked-cases.json');
|
||||
const CASES_DIR = join(homedir(), 'codeman-cases');
|
||||
@@ -142,3 +143,36 @@ describe('skill command wiring', () => {
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
describe('cases dir override (CODEMAN_CASES_PATH)', () => {
|
||||
// The Docker Compose deployment points Codeman at a host-absolute bind mount
|
||||
// so a Docker case resolves to the same path inside the container and on the
|
||||
// host daemon. The override shipped on the server's CASES_DIR only, which left
|
||||
// the CLI looking in the home default: `codeman skill install --case <name>`
|
||||
// then reported "Case not found" on exactly the deployment it exists for.
|
||||
const saved = process.env.CODEMAN_CASES_PATH;
|
||||
afterEach(() => {
|
||||
if (saved === undefined) delete process.env.CODEMAN_CASES_PATH;
|
||||
else process.env.CODEMAN_CASES_PATH = saved;
|
||||
});
|
||||
|
||||
it('moves the CLI and the server together', () => {
|
||||
process.env.CODEMAN_CASES_PATH = '/srv/codeman-cases';
|
||||
expect(getCasesDir()).toBe('/srv/codeman-cases');
|
||||
expect(resolveCliCasePath('demo')).toBe(join('/srv/codeman-cases', 'demo'));
|
||||
});
|
||||
|
||||
it('falls back to the home default when unset', () => {
|
||||
delete process.env.CODEMAN_CASES_PATH;
|
||||
expect(getCasesDir()).toBe(CASES_DIR);
|
||||
expect(resolveCliCasePath('demo')).toBe(join(CASES_DIR, 'demo'));
|
||||
});
|
||||
|
||||
it('still lets a linked case win over the override', () => {
|
||||
// The registry lookup runs first, so a case linked in from outside the cases
|
||||
// dir keeps resolving to its real location under Compose too.
|
||||
process.env.CODEMAN_CASES_PATH = '/srv/codeman-cases';
|
||||
writeLinkedCases(JSON.stringify({ linked: join(LINKED_ROOT, 'linked') }));
|
||||
expect(resolveCliCasePath('linked')).toBe(join(LINKED_ROOT, 'linked'));
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user