actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-17 07:54:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
TingluoHuang
2021-10-14 14:48:42 -04:00
parent 0a7611b0b5
commit ce1679bb6f
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,9 +53,9 @@ async function run(): Promise<void> {
// --entrypoint "tail" node:10.16-jessie "-f" "/dev/null" // --entrypoint "tail" node:10.16-jessie "-f" "/dev/null"
const containerId = await exec.getExecOutput('podman', [ const containerId = await exec.getExecOutput('podman', [
'create', 'create',
`--workdir ${jobContainer.containerWorkDirectory}`, // `--workdir ${jobContainer.containerWorkDirectory}`,
`--network ${networkName}`, `--network ${networkName}`,
`-v /Users/ting/Desktop/runner/_layout/_work:/__w`, // `-v /Users/ting/Desktop/runner/_layout/_work:/__w`,
`--entrypoint "${jobContainer.containerEntryPoint}"`, `--entrypoint "${jobContainer.containerEntryPoint}"`,
`${containerImage}`, `${containerImage}`,
`${jobContainer.containerEntryPointArgs}` `${jobContainer.containerEntryPointArgs}`

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

@@ -1069,7 +1069,7 @@ function run() {
core.debug(JSON.stringify(creationInput)); core.debug(JSON.stringify(creationInput));
const containers = creationInput.containers; const containers = creationInput.containers;
const jobContainer = containers[0]; const jobContainer = containers[0];
const networkName = "actions_podman_network"; const networkName = 'actions_podman_network';
// podman network create {network} -> track and return `network` for ${{job.container.network}} // podman network create {network} -> track and return `network` for ${{job.container.network}}
yield exec.exec('podman', ['network', 'create', networkName]); yield exec.exec('podman', ['network', 'create', networkName]);
const containerImage = `docker.io/library/${jobContainer.containerImage}`; const containerImage = `docker.io/library/${jobContainer.containerImage}`;
@@ -1089,10 +1089,11 @@ function run() {
// -v "/home/runner/work/_temp/_github_home":"/github/home" // -v "/home/runner/work/_temp/_github_home":"/github/home"
// -v "/home/runner/work/_temp/_github_workflow":"/github/workflow" // -v "/home/runner/work/_temp/_github_workflow":"/github/workflow"
// --entrypoint "tail" node:10.16-jessie "-f" "/dev/null" // --entrypoint "tail" node:10.16-jessie "-f" "/dev/null"
const containerId = yield exec.getExecOutput('podman', ['create', const containerId = yield exec.getExecOutput('podman', [
`--workdir ${jobContainer.containerWorkDirectory}`, 'create',
// `--workdir ${jobContainer.containerWorkDirectory}`,
`--network ${networkName}`, `--network ${networkName}`,
`-v /Users/ting/Desktop/runner/_layout/_work:/__w`, // `-v /Users/ting/Desktop/runner/_layout/_work:/__w`,
`--entrypoint "${jobContainer.containerEntryPoint}"`, `--entrypoint "${jobContainer.containerEntryPoint}"`,
`${containerImage}`, `${containerImage}`,
`${jobContainer.containerEntryPointArgs}` `${jobContainer.containerEntryPointArgs}`

2
src/Runner.Worker/Container/ContainerInfo.cs
View File

@@ -54,7 +54,7 @@ namespace GitHub.Runner.Worker.Container
_pathMappings.Add(new PathMapping(hostContext.GetDirectory(WellKnownDirectory.Externals), "/__e")); _pathMappings.Add(new PathMapping(hostContext.GetDirectory(WellKnownDirectory.Externals), "/__e"));
if (this.IsJobContainer) if (this.IsJobContainer)
{ {
this.MountVolumes.Add(new MountVolume("/var/run/docker.sock", "/var/run/docker.sock")); // this.MountVolumes.Add(new MountVolume("/var/run/docker.sock", "/var/run/docker.sock"));
} }
#endif #endif
if (container.Ports?.Count > 0) if (container.Ports?.Count > 0)