parent
af4fd4efb5
commit
9720455de9
|
@ -644,7 +644,7 @@ describe('flagMap', () => {
|
|||
expect(results).toEqual([
|
||||
['--catpants', 'a'],
|
||||
['--catpants', 'b'],
|
||||
['--catpants', 'c'],
|
||||
['--catpants', 'c']
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
|
|
@ -88,12 +88,7 @@ export async function getInputs(defaultContext: string): Promise<Inputs> {
|
|||
}
|
||||
|
||||
export async function getArgs(inputs: Inputs, defaultContext: string, buildxVersion: string): Promise<Array<string>> {
|
||||
return [
|
||||
'buildx',
|
||||
...await getBuildArgs(inputs, defaultContext, buildxVersion),
|
||||
...await getCommonArgs(inputs),
|
||||
inputs.context,
|
||||
];
|
||||
return ['buildx', ...(await getBuildArgs(inputs, defaultContext, buildxVersion)), ...(await getCommonArgs(inputs)), inputs.context];
|
||||
}
|
||||
|
||||
async function getBuildArgs(inputs: Inputs, defaultContext: string, buildxVersion: string): Promise<Array<string>> {
|
||||
|
@ -104,7 +99,7 @@ async function getBuildArgs(inputs: Inputs, defaultContext: string, buildxVersio
|
|||
...flagMap(inputs.labels, '--label'),
|
||||
...flagMap(inputs.outputs, '--output'),
|
||||
...flagMap(inputs.tags, '--tag'),
|
||||
...flagMap(inputs.ssh, '--ssh'),
|
||||
...flagMap(inputs.ssh, '--ssh')
|
||||
);
|
||||
|
||||
if (inputs.target) {
|
||||
|
|
Loading…
Reference in New Issue