Feature/prevent zombie containers

cli/src/cmd/test.js

@@ -103,6 +103,7 @@ export async function testApp({
   // build a temp image for test
   spinner.start('Building app docker image for test...\n');
   const imageId = await dockerBuild({
+    tag: 'iapp',
     isForTest: true,
     progressCallback: (msg) => {
       spinner.text = spinner.text + msg;

cli/src/execDocker/docker.js

@@ -180,36 +180,59 @@ export async function runDockerContainer({
     Env: env,
   });
 
-  // Start the container
-  // TODO we should handle abort signal to stop the container and avoid containers running after command is interrupted
-  await container.start();
-
-  // get the logs stream
-  const logsStream = await container.logs({
-    follow: true,
-    stdout: true,
-    stderr: true,
-  });
-  logsStream.on('data', (chunk) => {
-    // const streamType = chunk[0]; // 1 = stdout, 2 = stderr
-    const logData = chunk.slice(8).toString('utf-8'); // strip multiplexed stream header
-    logsCallback(logData);
-  });
-  logsStream.on('error', (err) => {
-    logsCallback('Error streaming logs:', err.message);
-  });
-
-  // Wait for the container to finish
-  await container.wait();
+  const stopAndRemoveContainer = async () => {
+    try {
+      await container.stop();
+      await container.remove();
+    } catch (error) {
+      throw Error('Error cleaning up container:', error);
+    }
+  };
 
-  // Check container status after waiting
-  const { State } = await container.inspect();
+  const handleInterrupt = async () => {
+    await stopAndRemoveContainer();
+    process.exit(0);
+  };
 
-  // Done with the container, remove the container
-  await container.remove();
+  process.on('SIGINT', handleInterrupt);
+  process.on('SIGTERM', handleInterrupt);
 
-  return {
-    exitCode: State.ExitCode,
-    outOfMemory: State.OOMKilled,
-  };
+  try {
+    // Start the container
+    await container.start();
+
+    // get the logs stream
+    const logsStream = await container.logs({
+      follow: true,
+      stdout: true,
+      stderr: true,
+    });
+    logsStream.on('data', (chunk) => {
+      const logData = chunk.slice(8).toString('utf-8'); // strip multiplexed stream header
+      logsCallback(logData);
+    });
+    logsStream.on('error', (err) => {
+      logsCallback('Error streaming logs:', err.message);
+    });
+
+    // Wait for the container to finish
+    await container.wait();
+
+    // Check container status after waiting
+    const { State } = await container.inspect();
+
+    // Done with the container, remove the container
+    await container.remove();
+
+    return {
+      exitCode: State.ExitCode,
+      outOfMemory: State.OOMKilled,
+    };
+  } catch (error) {
+    await stopAndRemoveContainer();
+    throw error;
+  } finally {
+    process.off('SIGINT', handleInterrupt);
+    process.off('SIGTERM', handleInterrupt);
+  }
 }