Merge pull request #1074 from crazy-max/build-cmd-debug

disable quotes detection for "outputs" input
docker · Mar 7, 2024 · af5a7ed · af5a7ed
2 parents 00ae31a + 2a85189
commit af5a7ed
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts
@@ -705,6 +705,26 @@ ANOTHER_SECRET=ANOTHER_SECRET_ENV`]
         '--metadata-file', path.join(tmpDir, 'metadata-file'),
         '.'
       ]
+    ],
+    [
+      29,
+      '0.12.0',
+      new Map<string, string>([
+        ['context', '.'],
+        ['outputs', `type=image,"name=localhost:5000/name/app:latest,localhost:5000/name/app:foo",push-by-digest=true,name-canonical=true,push=true`],
+        ['load', 'false'],
+        ['no-cache', 'false'],
+        ['push', 'false'],
+        ['pull', 'false'],
+      ]),
+      [
+        'build',
+        '--iidfile', path.join(tmpDir, 'iidfile'),
+        "--output", `type=image,"name=localhost:5000/name/app:latest,localhost:5000/name/app:foo",push-by-digest=true,name-canonical=true,push=true`,
+        "--provenance", `mode=min,inline-only=true,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789`,
+        '--metadata-file', path.join(tmpDir, 'metadata-file'),
+        '.'
+      ]
     ]
   ])(
     '[%d] given %p with %p as inputs, returns %p',

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/context.ts b/src/context.ts
@@ -60,7 +60,7 @@ export async function getInputs(): Promise<Inputs> {
     network: core.getInput('network'),
     noCache: core.getBooleanInput('no-cache'),
     noCacheFilters: Util.getInputList('no-cache-filters'),
-    outputs: Util.getInputList('outputs', {ignoreComma: true}),
+    outputs: Util.getInputList('outputs', {ignoreComma: true, quote: false}),
     platforms: Util.getInputList('platforms'),
     provenance: BuildxInputs.getProvenanceInput('provenance'),
     pull: core.getBooleanInput('pull'),

diff --git a/src/main.ts b/src/main.ts
@@ -17,6 +17,8 @@ actionsToolkit.run(
   // main
   async () => {
     const inputs: context.Inputs = await context.getInputs();
+    core.debug(`inputs: ${JSON.stringify(inputs)}`);
+
     const toolkit = new Toolkit();
 
     await core.group(`GitHub Actions runtime token ACs`, async () => {
@@ -73,7 +75,12 @@ actionsToolkit.run(
     });
 
     const args: string[] = await context.getArgs(inputs, toolkit);
+    core.debug(`context.getArgs: ${JSON.stringify(args)}`);
+
     const buildCmd = await toolkit.buildx.getCommand(args);
+    core.debug(`buildCmd.command: ${buildCmd.command}`);
+    core.debug(`buildCmd.args: ${JSON.stringify(buildCmd.args)}`);
+
     await Exec.getExecOutput(buildCmd.command, buildCmd.args, {
       ignoreReturnCode: true
     }).then(res => {