diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 2a881f63b..af2f6cff8 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,6 +1,7 @@ name: Docker Image CI on: + push: workflow_dispatch: diff --git a/src/Misc/containerEngineHandlers/kubectlHandler/src/kubectlHandler.ts b/src/Misc/containerEngineHandlers/kubectlHandler/src/kubectlHandler.ts index f5b3bac49..0b73faefe 100644 --- a/src/Misc/containerEngineHandlers/kubectlHandler/src/kubectlHandler.ts +++ b/src/Misc/containerEngineHandlers/kubectlHandler/src/kubectlHandler.ts @@ -76,7 +76,7 @@ async function run(): Promise { // copy over node.js const cpNodeArgs = [ 'cp', - '../externals/node16/bin', + '/actions-runner/externals/node16/bin', 'job-container:/__runner_util/' ] await exec.exec('kubectl', cpNodeArgs) @@ -84,14 +84,14 @@ async function run(): Promise { // copy over innerhandler const cpKubeInnerArgs = [ 'cp', - './kubeInnerHandler', + '/actions-runner/bin/kubeInnerHandler', 'job-container:/__runner_util/kubeInnerHandler' ] await exec.exec('kubectl', cpKubeInnerArgs) const creationOutput = { - JobContainerId: 'job-container' - // Network: "job-container" + JobContainerId: 'job-container', + Network: 'job-container' } const output = JSON.stringify({CreationOutput: creationOutput}) diff --git a/src/Misc/layoutbin/kubectlHandler/index.js b/src/Misc/layoutbin/kubectlHandler/index.js index bc652d661..eea8c5e6b 100644 --- a/src/Misc/layoutbin/kubectlHandler/index.js +++ b/src/Misc/layoutbin/kubectlHandler/index.js @@ -3044,13 +3044,22 @@ function run() { // get PATH inside the container // output containerId for ${{job.container.id}} // copy over node.js - const cpNodeArgs = ['cp', '../externals/node16/bin', 'job-container:/__runner_util/']; + const cpNodeArgs = [ + 'cp', + '/actions-runner/externals/node16/bin', + 'job-container:/__runner_util/' + ]; yield exec.exec('kubectl', cpNodeArgs); // copy over innerhandler - const cpKubeInnerArgs = ['cp', './kubeInnerHandler', 'job-container:/__runner_util/kubeInnerHandler']; + const cpKubeInnerArgs = [ + 'cp', + '/actions-runner/bin/kubeInnerHandler', + 'job-container:/__runner_util/kubeInnerHandler' + ]; yield exec.exec('kubectl', cpKubeInnerArgs); const creationOutput = { - JobContainerId: "job-container", + JobContainerId: 'job-container', + Network: "job-container" }; const output = JSON.stringify({ CreationOutput: creationOutput }); core.debug(output); @@ -3085,7 +3094,9 @@ function run() { execArgs.push('/__runner_util/node'); execArgs.push('/__runner_util/kubeInnerHandler'); core.debug(JSON.stringify(execArgs)); - yield exec.exec('kubectl', execArgs, { input: Buffer.from(JSON.stringify(execInput)) }); + yield exec.exec('kubectl', execArgs, { + input: Buffer.from(JSON.stringify(execInput)) + }); } }); }