actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2026-01-04 00:49:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
TingluoHuang
2021-10-14 16:40:42 -04:00
parent 5639175ecb
commit 42e7359f5c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,6 @@ async function run(): Promise<void> {
const creatArgs = ['create'] const creatArgs = ['create']
creatArgs.push(`--workdir=${jobContainer.containerWorkDirectory}`) creatArgs.push(`--workdir=${jobContainer.containerWorkDirectory}`)
creatArgs.push(`--network=${networkName}`) creatArgs.push(`--network=${networkName}`)
creatArgs.push(`--entrypoint=${jobContainer.containerEntryPoint}`)
for (const mountVolume of jobContainer.mountVolumes) { for (const mountVolume of jobContainer.mountVolumes) {
creatArgs.push( creatArgs.push(
@@ -62,8 +61,10 @@ async function run(): Promise<void> {
) )
} }
creatArgs.push(`--entrypoint=tail`)
creatArgs.push(containerImage) creatArgs.push(containerImage)
creatArgs.push(jobContainer.containerEntryPointArgs) creatArgs.push(`-f`)
creatArgs.push(`/dev/null`)
core.debug(JSON.stringify(creatArgs)) core.debug(JSON.stringify(creatArgs))

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

@@ -1092,12 +1092,13 @@ function run() {
const creatArgs = ['create']; const creatArgs = ['create'];
creatArgs.push(`--workdir=${jobContainer.containerWorkDirectory}`); creatArgs.push(`--workdir=${jobContainer.containerWorkDirectory}`);
creatArgs.push(`--network=${networkName}`); creatArgs.push(`--network=${networkName}`);
creatArgs.push(`--entrypoint=${jobContainer.containerEntryPoint}`);
for (const mountVolume of jobContainer.mountVolumes) { for (const mountVolume of jobContainer.mountVolumes) {
creatArgs.push(`-v=${mountVolume.sourceVolumePath}:${mountVolume.targetVolumePath}`); creatArgs.push(`-v=${mountVolume.sourceVolumePath}:${mountVolume.targetVolumePath}`);
} }
creatArgs.push(`--entrypoint=tail`);
creatArgs.push(containerImage); creatArgs.push(containerImage);
creatArgs.push(jobContainer.containerEntryPointArgs); creatArgs.push(`-f`);
creatArgs.push(`/dev/null`);
core.debug(JSON.stringify(creatArgs)); core.debug(JSON.stringify(creatArgs));
// const containerId = await exec.getExecOutput('podman', [ // const containerId = await exec.getExecOutput('podman', [
// 'create', // 'create',