neil/setup-buildx-action
1
0
Fork 0
mirror of https://github.com/docker/setup-buildx-action.git synced 2025-11-04 14:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #161 from crazy-max/fix-remote

Browse Source 
skip setting buildkitd flags and config for remote driver
This commit is contained in:
CrazyMax 2022-09-16 18:35:19 +02:00 committed by GitHub
commit f385c9ed95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/index.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

12
src/main.ts
View File

@ -63,7 +63,7 @@ async function run(): Promise<void> {
await context.asyncForEach(inputs.driverOpts, async driverOpt => { await context.asyncForEach(inputs.driverOpts, async driverOpt => {
createArgs.push('--driver-opt', driverOpt); createArgs.push('--driver-opt', driverOpt);
}); });
if (inputs.buildkitdFlags) { if (inputs.driver != 'remote' && inputs.buildkitdFlags) {
createArgs.push('--buildkitd-flags', inputs.buildkitdFlags); createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
} }
} }
@ -73,10 +73,12 @@ async function run(): Promise<void> {
if (inputs.endpoint) { if (inputs.endpoint) {
createArgs.push(inputs.endpoint); createArgs.push(inputs.endpoint);
} }
if (inputs.config) { if (inputs.driver != 'remote') {
createArgs.push('--config', await buildx.getConfigFile(inputs.config)); if (inputs.config) {
} else if (inputs.configInline) { createArgs.push('--config', await buildx.getConfigFile(inputs.config));
createArgs.push('--config', await buildx.getConfigInline(inputs.configInline)); } else if (inputs.configInline) {
createArgs.push('--config', await buildx.getConfigInline(inputs.configInline));
}
} }
const createCmd = buildx.getCommand(createArgs, standalone); const createCmd = buildx.getCommand(createArgs, standalone);
await exec.exec(createCmd.commandLine, createCmd.args); await exec.exec(createCmd.commandLine, createCmd.args);