actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-11 12:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
TingluoHuang
2021-10-14 15:11:17 -04:00
parent 493a2a0bf7
commit 029106a1dc
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Misc/containerEngineHandlers/podmanHandler/src/podmanHandler.ts
View File

@@ -79,11 +79,19 @@ async function run(): Promise<void> {
core.debug(output) core.debug(output)
process.stderr.write(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', 'ls'])
await exec.exec('podman', ['network', 'ps', '-a'])
} }
run() run()

12
src/Misc/layoutbin/podmanHandler/index.js
View File

@@ -1111,10 +1111,18 @@ function run() {
core.debug(output); core.debug(output);
process.stderr.write(output); process.stderr.write(output);
} }
// else if (command === 'Remove') { else if (command === 'Remove') {
// } else if (command === 'Exec') { 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', 'ls']);
yield exec.exec('podman', ['network', 'ps', '-a']);
}); });
} }
run(); run();

2
src/Runner.Worker/ContainerOperationProvider.cs
View File

@@ -123,7 +123,7 @@ namespace GitHub.Runner.Worker
container.ContainerWorkDirectory = container.TranslateToContainerPath(workingDirectory); container.ContainerWorkDirectory = container.TranslateToContainerPath(workingDirectory);
container.ContainerEntryPoint = "tail"; container.ContainerEntryPoint = "tail";
container.ContainerEntryPointArgs = "\"-f\" \"/dev/null\""; container.ContainerEntryPointArgs = "-f /dev/null";
} }
} }