Merge pull request #182 from crazy-max/releases-gh-token

set github token to list releases and download assets
This commit is contained in:
CrazyMax 2025-11-04 11:46:09 +01:00 committed by GitHub
commit efe9e3891a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 23 additions and 6 deletions

View file

@ -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
],
])(

View file

@ -34,6 +34,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:

2
dist/index.js generated vendored

File diff suppressed because one or more lines are too long

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long

View file

@ -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')
};
}

View file

@ -25,7 +25,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
@ -35,7 +35,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
@ -59,7 +59,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) {