Merge pull request #76 from tuler/feature/working-directory

Add workdir option
docker · Jul 19, 2022 · 5cb4f0e · 5cb4f0e
2 parents c7fa0af + e917a42
commit 5cb4f0e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -82,6 +82,7 @@ Following inputs can be used as `step.with` keys
 |------------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `builder`  | String   | Builder instance (see [setup-buildx](https://github.com/docker/setup-buildx-action) action)                                                          |
 | `files`    | List/CSV | List of [bake definition files](https://github.com/docker/buildx/blob/master/docs/reference/buildx_bake.md#file)                                     |
+| `workdir`  | String   | Working directory of execution                                                                                                                       |
 | `targets`  | List/CSV | List of bake targets                                                                                                                                 |
 | `no-cache` | Bool     | Do not use cache when building the image (default `false`)                                                                                           |
 | `pull`     | Bool     | Always attempt to pull a newer version of the image (default `false`)                                                                                |

diff --git a/action.yml b/action.yml
@@ -13,6 +13,10 @@ inputs:
   files:
     description: "List of bake definition files"
     required: true
+  workdir:
+    description: "Working directory of bake execution"
+    required: false
+    default: '.'
   targets:
     description: "List of bake targets"
     required: false

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
@@ -12,6 +12,7 @@ let _tmpDir: string;
 export interface Inputs {
   builder: string;
   files: string[];
+  workdir: string;
   targets: string[];
   noCache: boolean;
   pull: boolean;
@@ -36,6 +37,7 @@ export async function getInputs(): Promise<Inputs> {
   return {
     builder: core.getInput('builder'),
     files: getInputList('files'),
+    workdir: core.getInput('workdir') || '.',
     targets: getInputList('targets'),
     noCache: core.getBooleanInput('no-cache'),
     pull: core.getBooleanInput('pull'),

diff --git a/src/main.ts b/src/main.ts
@@ -44,11 +44,14 @@ async function run(): Promise<void> {
     const buildCmd = buildx.getCommand(args, standalone);
 
     core.startGroup(`Bake definition`);
-    await exec.exec(buildCmd.command, [...buildCmd.args, '--print']);
+    await exec.exec(buildCmd.command, [...buildCmd.args, '--print'], {
+      cwd: inputs.workdir
+    });
     core.endGroup();
 
     await exec
       .getExecOutput(buildCmd.command, buildCmd.args, {
+        cwd: inputs.workdir,
         ignoreReturnCode: true
       })
       .then(res => {