mirror of
https://github.com/docker/build-push-action
synced 2024-11-23 10:41:42 +00:00
simplified argument collection
Signed-off-by: Phred <fearphage@gmail.com>
This commit is contained in:
parent
4222161e3e
commit
af4fd4efb5
2 changed files with 33 additions and 21 deletions
|
@ -636,6 +636,19 @@ describe('asyncForEach', () => {
|
|||
});
|
||||
});
|
||||
|
||||
describe('flagMap', () => {
|
||||
it('should prepend array elements with the provided flag', async () => {
|
||||
const testValues = ['a', 'b', 'c'];
|
||||
const results: string[][] = context.flagMap(testValues, '--catpants');
|
||||
|
||||
expect(results).toEqual([
|
||||
['--catpants', 'a'],
|
||||
['--catpants', 'b'],
|
||||
['--catpants', 'c'],
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('setOutput', () => {
|
||||
beforeEach(() => {
|
||||
process.stdout.write = jest.fn();
|
||||
|
|
|
@ -88,24 +88,25 @@ export async function getInputs(defaultContext: string): Promise<Inputs> {
|
|||
}
|
||||
|
||||
export async function getArgs(inputs: Inputs, defaultContext: string, buildxVersion: string): Promise<Array<string>> {
|
||||
let args: Array<string> = ['buildx'];
|
||||
args.push.apply(args, await getBuildArgs(inputs, defaultContext, buildxVersion));
|
||||
args.push.apply(args, await getCommonArgs(inputs));
|
||||
args.push(inputs.context);
|
||||
return args;
|
||||
return [
|
||||
'buildx',
|
||||
...await getBuildArgs(inputs, defaultContext, buildxVersion),
|
||||
...await getCommonArgs(inputs),
|
||||
inputs.context,
|
||||
];
|
||||
}
|
||||
|
||||
async function getBuildArgs(inputs: Inputs, defaultContext: string, buildxVersion: string): Promise<Array<string>> {
|
||||
let args: Array<string> = ['build'];
|
||||
await asyncForEach(inputs.buildArgs, async buildArg => {
|
||||
args.push('--build-arg', buildArg);
|
||||
});
|
||||
await asyncForEach(inputs.labels, async label => {
|
||||
args.push('--label', label);
|
||||
});
|
||||
await asyncForEach(inputs.tags, async tag => {
|
||||
args.push('--tag', tag);
|
||||
});
|
||||
const args: Array<string> = ['build'].concat(
|
||||
...flagMap(inputs.buildArgs, '--build-arg'),
|
||||
...flagMap(inputs.cacheFrom, '--cache-from'),
|
||||
...flagMap(inputs.cacheTo, '--cache-to'),
|
||||
...flagMap(inputs.labels, '--label'),
|
||||
...flagMap(inputs.outputs, '--output'),
|
||||
...flagMap(inputs.tags, '--tag'),
|
||||
...flagMap(inputs.ssh, '--ssh'),
|
||||
);
|
||||
|
||||
if (inputs.target) {
|
||||
args.push('--target', inputs.target);
|
||||
}
|
||||
|
@ -115,9 +116,6 @@ async function getBuildArgs(inputs: Inputs, defaultContext: string, buildxVersio
|
|||
if (inputs.platforms.length > 0) {
|
||||
args.push('--platform', inputs.platforms.join(','));
|
||||
}
|
||||
await asyncForEach(inputs.outputs, async output => {
|
||||
args.push('--output', output);
|
||||
});
|
||||
if (!buildx.isLocalOrTarExporter(inputs.outputs) && (inputs.platforms.length == 0 || buildx.satisfies(buildxVersion, '>=0.4.2'))) {
|
||||
args.push('--iidfile', await buildx.getImageIDFile());
|
||||
}
|
||||
|
@ -147,9 +145,6 @@ async function getBuildArgs(inputs: Inputs, defaultContext: string, buildxVersio
|
|||
if (inputs.githubToken && !buildx.hasGitAuthToken(inputs.secrets) && inputs.context == defaultContext) {
|
||||
args.push('--secret', await buildx.getSecretString(`GIT_AUTH_TOKEN=${inputs.githubToken}`));
|
||||
}
|
||||
await asyncForEach(inputs.ssh, async ssh => {
|
||||
args.push('--ssh', ssh);
|
||||
});
|
||||
if (inputs.file) {
|
||||
args.push('--file', inputs.file);
|
||||
}
|
||||
|
@ -212,6 +207,10 @@ export const asyncForEach = async (array, callback) => {
|
|||
}
|
||||
};
|
||||
|
||||
export function flagMap(array: string[], flag: string): string[][] {
|
||||
return array.map(value => [flag, value]);
|
||||
}
|
||||
|
||||
// FIXME: Temp fix https://github.com/actions/toolkit/issues/777
|
||||
export function setOutput(name: string, value: any): void {
|
||||
issueCommand('set-output', {name}, value);
|
||||
|
|
Loading…
Reference in a new issue