Prefer forwarding lowercased ENV vars to proxy

Per the suggestion of https://docs.github.com/en/actions/hosting-your-own-runners/using-a-proxy-server-with-self-hosted-runners
github · May 3, 2022 · 7cf8e5c · 7cf8e5c
1 parent 895a5b2
commit 7cf8e5c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/__tests__/proxy-integration.test.ts b/__tests__/proxy-integration.test.ts
@@ -106,7 +106,7 @@ integration('ProxyBuilder', () => {
     await proxy.container.start()
 
     const id = proxy.container.id
-    const proc = spawnSync('docker', ['exec', id, 'printenv', 'HTTP_PROXY'])
+    const proc = spawnSync('docker', ['exec', id, 'printenv', 'http_proxy'])
     const output = proc.stdout.toString()
     expect(output).toEqual('HTTP_PROXY')
   })

diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/dist/main/index.js.map b/dist/main/index.js.map
diff --git a/src/proxy.ts b/src/proxy.ts
@@ -201,12 +201,9 @@ export class ProxyBuilder {
       AttachStdout: true,
       AttachStderr: true,
       Env: [
-        `http_proxy=${process.env.http_proxy}`,
-        `HTTP_PROXY=${process.env.HTTP_PROXY}`,
-        `https_proxy=${process.env.https_proxy}`,
-        `HTTPS_PROXY=${process.env.HTTPS_PROXY}`,
-        `no_proxy=${process.env.no_proxy}`,
-        `NO_PROXY=${process.env.NO_PROXY}`,
+        `http_proxy=${process.env.http_proxy || process.env.HTTP_PROXY}`,
+        `https_proxy=${process.env.https_proxy || process.env.HTTPS_PROXY}`,
+        `no_proxy=${process.env.no_proxy || process.env.NO_PROXY}`,
         `JOB_ID=${jobId}`
       ],
       Entrypoint: [