Merge pull request #86 from docker/dependabot/npm_and_yarn/csv-parse-5.3.0

Bump csv-parse from 5.2.0 to 5.3.0

.github/workflows/ci.yml

@@ -34,11 +34,11 @@ jobs:
         uses: actions/checkout@v3
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       -
         name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           driver-opts: network=host
       -
@@ -51,10 +51,6 @@ jobs:
           targets: |
             ${{ matrix.target }}
           push: false # set to true when https://github.com/docker/buildx/issues/179 is fixed
-      -
-        name: Dump context
-        if: always()
-        uses: crazy-max/ghaction-dump-context@v1
 
   error-msg:
     runs-on: ubuntu-latest
@@ -71,10 +67,6 @@ jobs:
             ./test/config.hcl
           set: |
             *.platform=linux/amd64,linux/ppc64le,linux/s390x
-      -
-        name: Dump context
-        if: always()
-        uses: crazy-max/ghaction-dump-context@v1
 
   error-check:
     runs-on: ubuntu-latest
@@ -102,10 +94,6 @@ jobs:
             echo "::error::Should have failed"
             exit 1
           fi
-      -
-        name: Dump context
-        if: always()
-        uses: crazy-max/ghaction-dump-context@v1
 
   standalone:
     runs-on: ubuntu-latest
@@ -119,10 +107,23 @@ jobs:
           sudo apt-get purge -y moby-cli moby-buildx
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Build
         uses: ./
         with:
           files: |
             ./test/config.hcl
+
+  source:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Build
+        uses: ./
+        with:
+          source: https://github.com/docker/buildx.git#v0.8.2
+          targets: update-docs

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v3
       -
         name: Test
-        uses: docker/bake-action@v1
+        uses: docker/bake-action@v2
         with:
           targets: test
       -

.github/workflows/validate.yml

@@ -19,6 +19,6 @@ jobs:
         uses: actions/checkout@v3
       -
         name: Validate
-        uses: docker/bake-action@v1
+        uses: docker/bake-action@v2
         with:
           targets: validate

README.md

@@ -40,13 +40,13 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -78,16 +78,18 @@ Following inputs can be used as `step.with` keys
 > targets: default,release
 > ```
 
-| Name             | Type     | Description                        |
+| Name       | Type     | Description                                                                                                                                          |
-|------------------|----------|------------------------------------|
+|------------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `builder`        | String   | Builder instance (see [setup-buildx](https://github.com/docker/setup-buildx-action) action) |
+| `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) |
+| `files`    | List/CSV | List of [bake definition files](https://github.com/docker/buildx/blob/master/docs/reference/buildx_bake.md#file)                                     |
-| `targets`        | List/CSV | List of bake targets |
+| `workdir`  | String   | Working directory of execution                                                                                                                       |
-| `no-cache`       | Bool     | Do not use cache when building the image (default `false`) |
+| `targets`  | List/CSV | List of bake targets                                                                                                                                 |
-| `pull`           | Bool     | Always attempt to pull a newer version of the image (default `false`) |
+| `no-cache` | Bool     | Do not use cache when building the image (default `false`)                                                                                           |
-| `load`           | Bool     | Load is a shorthand for `--set=*.output=type=docker` (default `false`) |
+| `pull`     | Bool     | Always attempt to pull a newer version of the image (default `false`)                                                                                |
-| `push`           | Bool     | Push is a shorthand for `--set=*.output=type=registry` (default `false`) |
+| `load`     | Bool     | Load is a shorthand for `--set=*.output=type=docker` (default `false`)                                                                               |
-| `set`            | List     | List of [targets values to override](https://github.com/docker/buildx/blob/master/docs/reference/buildx_bake.md#set) (eg: `targetpattern.key=value`) |
+| `push`     | Bool     | Push is a shorthand for `--set=*.output=type=registry` (default `false`)                                                                             |
+| `set`      | List     | List of [targets values to override](https://github.com/docker/buildx/blob/master/docs/reference/buildx_bake.md#set) (eg: `targetpattern.key=value`) |
+| `source`   | String   | [Remote bake definition](https://github.com/docker/buildx/blob/master/docs/guides/bake/file-definition.md#remote-definition) to build from           |
 
 ### outputs
 

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
@@ -35,6 +39,9 @@ inputs:
   set:
     description: "List of targets values to override (eg. targetpattern.key=value)"
     required: false
+  source:
+    description: "Remote bake definition to build from"
+    required: false
 
 outputs:
   metadata:

package.json

@@ -28,9 +28,9 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@actions/core": "^1.6.0",
+    "@actions/core": "^1.9.0",
     "@actions/exec": "^1.1.1",
-    "csv-parse": "^5.0.4",
+    "csv-parse": "^5.3.0",
     "semver": "^7.3.7",
     "tmp": "^0.2.1"
   },

src/context.ts

@@ -12,12 +12,14 @@ let _tmpDir: string;
 export interface Inputs {
   builder: string;
   files: string[];
+  workdir: string;
   targets: string[];
   noCache: boolean;
   pull: boolean;
   load: boolean;
   push: boolean;
   set: string[];
+  source: string;
 }
 
 export function tmpDir(): string {
@@ -35,12 +37,14 @@ 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'),
     load: core.getBooleanInput('load'),
     push: core.getBooleanInput('push'),
-    set: getInputList('set', true)
+    set: getInputList('set', true),
+    source: core.getInput('source')
   };
 }
 
@@ -55,6 +59,9 @@ export async function getArgs(inputs: Inputs, buildxVersion: string): Promise<Ar
 
 async function getBakeArgs(inputs: Inputs, buildxVersion: string): Promise<Array<string>> {
   const args: Array<string> = ['bake'];
+  if (inputs.source) {
+    args.push(inputs.source);
+  }
   await asyncForEach(inputs.files, async file => {
     args.push('--file', file);
   });

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 => {

yarn.lock

@@ -2,12 +2,12 @@
 # yarn lockfile v1
 
 
-"@actions/core@^1.6.0":
+"@actions/core@^1.9.0":
-  version "1.6.0"
+  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.6.0.tgz#0568e47039bfb6a9170393a73f3b7eb3b22462cb"
+  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.9.0.tgz#20c1baac5d4bd2508ba1fc3e5f3fc4b8a80d4082"
-  integrity sha512-NB1UAZomZlCV/LmJqkLhNTqtKfFXJZAUPcfl/zqG7EfsQdeUJtaWO98SGbuQ3pydJ3fHl2CvI/51OKYlCYYcaw==
+  integrity sha512-5pbM693Ih59ZdUhgk+fts+bUWTnIdHV3kwOSr+QIoFHMLg7Gzhwm0cifDY/AG68ekEJAkHnQVpcy4f6GjmzBCA==
   dependencies:
-    "@actions/http-client" "^1.0.11"
+    "@actions/http-client" "^2.0.1"
 
 "@actions/exec@^1.1.1":
   version "1.1.1"
@@ -16,12 +16,12 @@
   dependencies:
     "@actions/io" "^1.0.1"
 
-"@actions/http-client@^1.0.11":
+"@actions/http-client@^2.0.1":
-  version "1.0.11"
+  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.11.tgz#c58b12e9aa8b159ee39e7dd6cbd0e91d905633c0"
+  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.0.1.tgz#873f4ca98fe32f6839462a6f046332677322f99c"
-  integrity sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==
+  integrity sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==
   dependencies:
-    tunnel "0.0.6"
+    tunnel "^0.0.6"
 
 "@actions/io@^1.0.1":
   version "1.0.2"
@@ -1444,10 +1444,10 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
-csv-parse@*, csv-parse@^5.0.4:
+csv-parse@*, csv-parse@^5.3.0:
-  version "5.0.4"
+  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.0.4.tgz#97e5e654413bcf95f2714ce09bcb2be6de0eb8e3"
+  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.3.0.tgz#85cc02fc9d1c89bd1b02e69069c960f8b8064322"
-  integrity sha512-5AIdl8l6n3iYQYxan5djB5eKDa+vBnhfWZtRpJTcrETWfVLYN0WSj3L9RwvgYt+psoO77juUr8TG8qpfGZifVQ==
+  integrity sha512-UXJCGwvJ2fep39purtAn27OUYmxB1JQto+zhZ4QlJpzsirtSFbzLvip1aIgziqNdZp/TptvsKEV5BZSxe10/DQ==
 
 data-urls@^2.0.0:
   version "2.0.0"
@@ -3351,7 +3351,7 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
-tunnel@0.0.6:
+tunnel@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
   integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==