diff --git a/src/index.ts b/src/index.ts index d6c3a76..353f4f5 100644 --- a/src/index.ts +++ b/src/index.ts @@ -24,10 +24,11 @@ async function run() { try { // Build docker image - const actionImage = await Docker.build({ path: actionFolder, dockerfile, baseImage }); + //const actionImage = await Docker.build({ path: actionFolder, dockerfile, baseImage }); // Run docker image - await Docker.run(actionImage, { + await Docker.run(baseImage, { + actionFolder, unityVersion, workspace, projectPath, diff --git a/src/model/docker.ts b/src/model/docker.ts index b6b661e..6408378 100644 --- a/src/model/docker.ts +++ b/src/model/docker.ts @@ -21,6 +21,7 @@ const Docker = { async run(image, parameters, silent = false) { const { + actionFolder, unityVersion, workspace, projectPath, @@ -72,11 +73,15 @@ const Docker = { --volume "${githubHome}":"/root:z" \ --volume "${githubWorkflow}":"/github/workflow:z" \ --volume "${workspace}":"/github/workspace:z" \ + --volume "${actionFolder}/steps":"/steps" \ + --volume "${artifactsPath}/entrypoint.sh":"/entrypoint.sh" \ ${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \ ${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \ ${useHostNetwork ? '--net=host' : ''} \ ${githubToken ? '--env USE_EXIT_CODE=false' : '--env USE_EXIT_CODE=true'} \ - ${image}`; + ${image} \ + -- + /entrypoint.sh` ; await exec(command, undefined, { silent }); },