From 69aa8d89841099a894e5297e6a95831a3b6bf219 Mon Sep 17 00:00:00 2001
From: TingluoHuang <TingluoHuang@github.com>
Date: Thu, 3 Sep 2020 17:24:59 -0400
Subject: [PATCH] fix node

---
 Dockerfile                                            | 4 ----
 runners.yaml                                          | 1 +
 src/Runner.Worker/Handlers/NodeScriptActionHandler.cs | 4 ++++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0d651e888..e8735f34c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,10 +40,6 @@ COPY ./src/Misc/jobstart.sh /actions-runner/jobstart.sh
 COPY ./src/Misc/jobrunning.sh /actions-runner/jobrunning.sh
 COPY ./src/Misc/jobcomplete.sh /actions-runner/jobcomplete.sh
 
-
-# Allow runner to run as root
-ENV RUNNER_ALLOW_RUNASROOT=1
-
 RUN /actions-runner/download-runner.sh
 RUN rm -f /actions-runner/download-runner.sh
 
diff --git a/runners.yaml b/runners.yaml
index 583611747..5f1e9871b 100644
--- a/runners.yaml
+++ b/runners.yaml
@@ -12,3 +12,4 @@ spec:
   template:
     spec:
       setupDockerInDocker: true
+      imagePullPolicy: Always
\ No newline at end of file
diff --git a/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs b/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs
index da0d66f67..40321e51b 100644
--- a/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs
+++ b/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs
@@ -82,6 +82,10 @@ namespace GitHub.Runner.Worker.Handlers
 
             var nodeRuntimeVersion = await StepHost.DetermineNodeRuntimeVersion(ExecutionContext);
             string file = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Externals), nodeRuntimeVersion, "bin", $"node{IOUtil.ExeExtension}");
+            if (System.Environment.GetEnvironmentVariable("K8S_POD_NAME") != null)
+            {
+                file = Path.Combine(Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Work), "__externals_copy"), nodeRuntimeVersion, "bin", $"node{IOUtil.ExeExtension}");
+            }
 
             // Format the arguments passed to node.
             // 1) Wrap the script file path in double quotes.