Merge pull request #202 from step-security/auto-cherry-pick

chore: Cherry-picked changes from upstream

Author: Raj-StepSecurity

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
           - v27.3.1
           - type=image,tag=27.3.1
         include:
-          - os: macos-13
+          - os: macos-15-intel
             version: v27.3.1
     steps:
       - name: Harden Runner
@@ -53,7 +53,6 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          #- macos-14  # no virt: https://github.com/docker/actions-toolkit/issues/317
           - windows-latest
     steps:
       - name: Harden Runner
@@ -78,7 +77,6 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          #- macos-14  # no virt: https://github.com/docker/actions-toolkit/issues/317
           - windows-latest
     steps:
       - name: Harden Runner
@@ -108,8 +106,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          #- macos-14  # no virt: https://github.com/docker/actions-toolkit/issues/317
-          - macos-13
+          - macos-15-intel
           - windows-latest
     steps:
       - name: Harden Runner
@@ -132,8 +129,7 @@ jobs:
           docker context inspect foo
 
   lima-start-args:
-    #runs-on: macos-14  # no virt: https://github.com/docker/actions-toolkit/issues/317
-    runs-on: macos-13
+    runs-on: macos-15-intel
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
@@ -207,8 +203,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          #- macos-14  # no virt: https://github.com/docker/actions-toolkit/issues/317
-          - macos-13
+          - macos-15-intel
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
@@ -322,8 +317,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          #- macos-14  # no virt: https://github.com/docker/actions-toolkit/issues/317
-          - macos-13
+          - macos-15-intel
           - windows-latest
     steps:
       -
@@ -374,7 +368,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-13
+          - macos-15-intel
           - windows-latest
     steps:
       -

__tests__/context.test.ts

@@ -34,6 +34,7 @@ describe('getInputs', () => {
         rootless: false,
         setHost: false,
         runtimeBasedir: path.join(os.homedir(), `setup-docker-action`),
+        githubToken: '',
       } as context.Inputs
     ],
     [
@@ -57,6 +58,7 @@ describe('getInputs', () => {
         rootless: false,
         setHost: false,
         runtimeBasedir: path.join(os.homedir(), `setup-docker-action`),
+        githubToken: '',
       } as context.Inputs
     ],
     [
@@ -76,6 +78,7 @@ describe('getInputs', () => {
         rootless: false,
         setHost: true,
         runtimeBasedir: path.join(os.homedir(), `setup-docker-action`),
+        githubToken: '',
       } as context.Inputs
     ],
     [
@@ -97,6 +100,7 @@ describe('getInputs', () => {
         rootless: false,
         setHost: false,
         runtimeBasedir: path.join(os.homedir(), `setup-docker-action`),
+        githubToken: '',
       } as context.Inputs
     ],
     [
@@ -116,6 +120,7 @@ describe('getInputs', () => {
         rootless: false,
         setHost: false,
         runtimeBasedir: path.join(os.homedir(), `setup-docker-action`),
+        githubToken: '',
       } as context.Inputs
     ],
     [
@@ -136,6 +141,7 @@ describe('getInputs', () => {
         daemonConfig: '',
         rootless: false,
         runtimeBasedir: path.join(os.homedir(), `setup-docker-action`),
+        githubToken: '',
       } as context.Inputs
     ],
     [
@@ -156,6 +162,7 @@ describe('getInputs', () => {
         daemonConfig: '',
         rootless: false,
         runtimeBasedir: path.join(os.homedir(), `setup-docker-action`),
+        githubToken: '',
       } as context.Inputs
     ],
     [
@@ -175,6 +182,7 @@ describe('getInputs', () => {
         daemonConfig: '',
         rootless: false,
         runtimeBasedir: path.join(os.homedir(), `setup-docker-action`),
+        githubToken: '',
       } as context.Inputs
     ],
     [
@@ -194,6 +202,7 @@ describe('getInputs', () => {
         daemonConfig: '',
         rootless: true,
         runtimeBasedir: path.join(os.homedir(), `setup-docker-action`),
+        githubToken: '',
       } as context.Inputs
     ],
     [
@@ -216,6 +225,7 @@ describe('getInputs', () => {
         rootless: false,
         setHost: false,
         runtimeBasedir: path.join(os.homedir(), `setup-docker-action`),
+        githubToken: '',
       } as context.Inputs
     ],
   ])(

action.yml

@@ -33,6 +33,10 @@ inputs:
   runtime-basedir:
     description: 'Docker runtime base directory'
     required: false
+  github-token:
+    description: "GitHub Token used to get releases and download assets"
+    default: ${{ github.token }}
+    required: false
 
 outputs:
   sock:

dist/index.js

@@ -25,7 +25,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@actions/core": "^1.10.1",
-    "@docker/actions-toolkit": "^0.64.0",
+    "@docker/actions-toolkit": "^0.65.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {

dist/index.js.map

@@ -14,6 +14,7 @@ export interface Inputs {
   setHost: boolean;
   rootless: boolean;
   runtimeBasedir: string;
+  githubToken: string;
 }
 
 export function getInputs(): Inputs {
@@ -31,7 +32,8 @@ export function getInputs(): Inputs {
     context: core.getInput('context'),
     setHost: core.getBooleanInput('set-host'),
     rootless: core.getBooleanInput('rootless'),
-    runtimeBasedir: core.getInput('runtime-basedir') || path.join(os.homedir(), `setup-docker-action`)
+    runtimeBasedir: core.getInput('runtime-basedir') || path.join(os.homedir(), `setup-docker-action`),
+    githubToken: core.getInput('github-token')
   };
 }
 

dist/licenses.txt

@@ -43,7 +43,7 @@ actionsToolkit.run(
 
     if (input.source.type === 'image') {
       await core.group(`Download and install regctl`, async () => {
-        const regclientInstall = new RegclientInstall();
+        const regclientInstall = new RegclientInstall({githubToken: input.githubToken});
         const regclientBinPath = await regclientInstall.download(
           process.env.REGCTL_VERSION && process.env.REGCTL_VERSION.trim()
             ? process.env.REGCTL_VERSION
@@ -53,7 +53,7 @@ actionsToolkit.run(
         await regclientInstall.install(regclientBinPath);
       });
       await core.group(`Download and install undock`, async () => {
-        const undockInstall = new UndockInstall();
+        const undockInstall = new UndockInstall({githubToken: input.githubToken});
         const undockBinPath = await undockInstall.download(
           process.env.UNDOCK_VERSION && process.env.UNDOCK_VERSION.trim()
             ? process.env.UNDOCK_VERSION
@@ -77,7 +77,8 @@ actionsToolkit.run(
       rootless: input.rootless,
       contextName: input.context || 'setup-docker-action',
       daemonConfig: input.daemonConfig,
-      localTCPPort: tcpPort
+      localTCPPort: tcpPort,
+      githubToken: input.githubToken
     });
     let toolDir;
     if (!(await Docker.isAvailable()) || input.source) {