From 029106a1dc912a15819a01fe088271c126cfdaf7 Mon Sep 17 00:00:00 2001
From: TingluoHuang <TingluoHuang@github.com>
Date: Thu, 14 Oct 2021 15:11:17 -0400
Subject: [PATCH] .

---
 .../podmanHandler/src/podmanHandler.ts               | 12 ++++++++++--
 src/Misc/layoutbin/podmanHandler/index.js            | 12 ++++++++++--
 src/Runner.Worker/ContainerOperationProvider.cs      |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/Misc/containerEngineHandlers/podmanHandler/src/podmanHandler.ts b/src/Misc/containerEngineHandlers/podmanHandler/src/podmanHandler.ts
index 748e922fe..333fddcc3 100644
--- a/src/Misc/containerEngineHandlers/podmanHandler/src/podmanHandler.ts
+++ b/src/Misc/containerEngineHandlers/podmanHandler/src/podmanHandler.ts
@@ -79,11 +79,19 @@ async function run(): Promise<void> {
     core.debug(output)
 
     process.stderr.write(output)
+  } else if (command === 'Remove') {
+    const removeInput = inputJson.removeInput
+    core.debug(JSON.stringify(removeInput))
+    const jobContainerId = removeInput.jobContainerId
+    const network = removeInput.network
+
+    await exec.exec('podman', ['rm', '-f', jobContainerId])
+    await exec.exec('podman', ['network', 'rm', '-f', network])
   }
-  // else if (command === 'Remove') {
-  // } else if (command === 'Exec') {
+  // else if (command === 'Exec') {
   // }
   await exec.exec('podman', ['network', 'ls'])
+  await exec.exec('podman', ['network', 'ps', '-a'])
 }
 
 run()
diff --git a/src/Misc/layoutbin/podmanHandler/index.js b/src/Misc/layoutbin/podmanHandler/index.js
index 3eafeab7e..b3c64e0b9 100644
--- a/src/Misc/layoutbin/podmanHandler/index.js
+++ b/src/Misc/layoutbin/podmanHandler/index.js
@@ -1111,10 +1111,18 @@ function run() {
             core.debug(output);
             process.stderr.write(output);
         }
-        // else if (command === 'Remove') {
-        // } else if (command === 'Exec') {
+        else if (command === 'Remove') {
+            const removeInput = inputJson.removeInput;
+            core.debug(JSON.stringify(removeInput));
+            const jobContainerId = removeInput.jobContainerId;
+            const network = removeInput.network;
+            yield exec.exec('podman', ['rm', '-f', jobContainerId]);
+            yield exec.exec('podman', ['network', 'rm', '-f', network]);
+        }
+        // else if (command === 'Exec') {
         // }
         yield exec.exec('podman', ['network', 'ls']);
+        yield exec.exec('podman', ['network', 'ps', '-a']);
     });
 }
 run();
diff --git a/src/Runner.Worker/ContainerOperationProvider.cs b/src/Runner.Worker/ContainerOperationProvider.cs
index 77e08b293..1408becc7 100644
--- a/src/Runner.Worker/ContainerOperationProvider.cs
+++ b/src/Runner.Worker/ContainerOperationProvider.cs
@@ -123,7 +123,7 @@ namespace GitHub.Runner.Worker
 
                     container.ContainerWorkDirectory = container.TranslateToContainerPath(workingDirectory);
                     container.ContainerEntryPoint = "tail";
-                    container.ContainerEntryPointArgs = "\"-f\" \"/dev/null\"";
+                    container.ContainerEntryPointArgs = "-f /dev/null";
                 }
             }