Merge branch 'main' into skill/ollama-tool

This commit is contained in:
github-actions[bot]
2026-03-19 19:05:42 +00:00
2 changed files with 4 additions and 4 deletions

View File

@@ -41,7 +41,7 @@ describe('readonlyMountArgs', () => {
describe('stopContainer', () => {
it('returns stop command using CONTAINER_RUNTIME_BIN', () => {
expect(stopContainer('nanoclaw-test-123')).toBe(
`${CONTAINER_RUNTIME_BIN} stop nanoclaw-test-123`,
`${CONTAINER_RUNTIME_BIN} stop -t 1 nanoclaw-test-123`,
);
});
});
@@ -93,12 +93,12 @@ describe('cleanupOrphans', () => {
expect(mockExecSync).toHaveBeenCalledTimes(3);
expect(mockExecSync).toHaveBeenNthCalledWith(
2,
`${CONTAINER_RUNTIME_BIN} stop nanoclaw-group1-111`,
`${CONTAINER_RUNTIME_BIN} stop -t 1 nanoclaw-group1-111`,
{ stdio: 'pipe' },
);
expect(mockExecSync).toHaveBeenNthCalledWith(
3,
`${CONTAINER_RUNTIME_BIN} stop nanoclaw-group2-222`,
`${CONTAINER_RUNTIME_BIN} stop -t 1 nanoclaw-group2-222`,
{ stdio: 'pipe' },
);
expect(logger.info).toHaveBeenCalledWith(

View File

@@ -59,7 +59,7 @@ export function readonlyMountArgs(
/** Returns the shell command to stop a container by name. */
export function stopContainer(name: string): string {
return `${CONTAINER_RUNTIME_BIN} stop ${name}`;
return `${CONTAINER_RUNTIME_BIN} stop -t 1 ${name}`;
}
/** Ensure the container runtime is running, starting it if needed. */