mirror of
https://gitea.com/docker/build-push-action.git
synced 2024-11-26 11:29:38 +01:00
Compute args order
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
parent
444d7e9909
commit
1ca381eec1
2 changed files with 2 additions and 4 deletions
2
dist/index.js
generated
vendored
2
dist/index.js
generated
vendored
|
@ -5660,13 +5660,13 @@ function run() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let inputs = yield context_1.getInputs();
|
let inputs = yield context_1.getInputs();
|
||||||
const args = yield context_1.getArgs(inputs);
|
|
||||||
if (inputs.builder) {
|
if (inputs.builder) {
|
||||||
core.info(`📌 Using builder instance ${inputs.builder}`);
|
core.info(`📌 Using builder instance ${inputs.builder}`);
|
||||||
yield buildx.use(inputs.builder);
|
yield buildx.use(inputs.builder);
|
||||||
}
|
}
|
||||||
inputs = yield github.restoreCache(inputs);
|
inputs = yield github.restoreCache(inputs);
|
||||||
core.info(`🏃 Starting build...`);
|
core.info(`🏃 Starting build...`);
|
||||||
|
const args = yield context_1.getArgs(inputs);
|
||||||
yield exec.exec('docker', args);
|
yield exec.exec('docker', args);
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
|
|
|
@ -19,16 +19,14 @@ async function run(): Promise<void> {
|
||||||
}
|
}
|
||||||
|
|
||||||
let inputs: Inputs = await getInputs();
|
let inputs: Inputs = await getInputs();
|
||||||
const args: string[] = await getArgs(inputs);
|
|
||||||
|
|
||||||
if (inputs.builder) {
|
if (inputs.builder) {
|
||||||
core.info(`📌 Using builder instance ${inputs.builder}`);
|
core.info(`📌 Using builder instance ${inputs.builder}`);
|
||||||
await buildx.use(inputs.builder);
|
await buildx.use(inputs.builder);
|
||||||
}
|
}
|
||||||
|
|
||||||
inputs = await github.restoreCache(inputs);
|
inputs = await github.restoreCache(inputs);
|
||||||
|
|
||||||
core.info(`🏃 Starting build...`);
|
core.info(`🏃 Starting build...`);
|
||||||
|
const args: string[] = await getArgs(inputs);
|
||||||
await exec.exec('docker', args);
|
await exec.exec('docker', args);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
core.setFailed(error.message);
|
core.setFailed(error.message);
|
||||||
|
|
Loading…
Reference in a new issue