Merge pull request #651 from takeru/fix/docker-stop-timeout
fix: reduce docker stop timeout for faster restarts
This commit is contained in:
@@ -41,7 +41,7 @@ describe('readonlyMountArgs', () => {
|
|||||||
describe('stopContainer', () => {
|
describe('stopContainer', () => {
|
||||||
it('returns stop command using CONTAINER_RUNTIME_BIN', () => {
|
it('returns stop command using CONTAINER_RUNTIME_BIN', () => {
|
||||||
expect(stopContainer('nanoclaw-test-123')).toBe(
|
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).toHaveBeenCalledTimes(3);
|
||||||
expect(mockExecSync).toHaveBeenNthCalledWith(
|
expect(mockExecSync).toHaveBeenNthCalledWith(
|
||||||
2,
|
2,
|
||||||
`${CONTAINER_RUNTIME_BIN} stop nanoclaw-group1-111`,
|
`${CONTAINER_RUNTIME_BIN} stop -t 1 nanoclaw-group1-111`,
|
||||||
{ stdio: 'pipe' },
|
{ stdio: 'pipe' },
|
||||||
);
|
);
|
||||||
expect(mockExecSync).toHaveBeenNthCalledWith(
|
expect(mockExecSync).toHaveBeenNthCalledWith(
|
||||||
3,
|
3,
|
||||||
`${CONTAINER_RUNTIME_BIN} stop nanoclaw-group2-222`,
|
`${CONTAINER_RUNTIME_BIN} stop -t 1 nanoclaw-group2-222`,
|
||||||
{ stdio: 'pipe' },
|
{ stdio: 'pipe' },
|
||||||
);
|
);
|
||||||
expect(logger.info).toHaveBeenCalledWith(
|
expect(logger.info).toHaveBeenCalledWith(
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ export function readonlyMountArgs(
|
|||||||
|
|
||||||
/** Returns the shell command to stop a container by name. */
|
/** Returns the shell command to stop a container by name. */
|
||||||
export function stopContainer(name: string): string {
|
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. */
|
/** Ensure the container runtime is running, starting it if needed. */
|
||||||
|
|||||||
Reference in New Issue
Block a user