Merge pull request #8 from docker/dockerorg

Move to Docker org

.dev/readme.md

@@ -1,11 +0,0 @@
-https://github.com/homoluctus/slatify/
-https://github.com/technote-space/toc-generator/commit/06ca2702bc545e4c2a31bc8b6cfd052de59b0af5/checks?check_suite_id=250009775
-https://github.com/technote-space/release-github-actions
-
-
-docker buildx rm builder
-docker run --rm --privileged multiarch/qemu-user-static:register --reset -p yes --credential yes
-docker buildx create --name builder --driver docker-container --use
-docker buildx inspect --bootstrap
-
-docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x --output "type=image,push=false" -t buildx --file ./test/Dockerfile-sudo ./test

.dev/release.yml

@@ -1,87 +0,0 @@
-name: release
-
-on:
-  create
-
-on:
-  push:
-    branches:
-      - releases/*
-    paths:
-      - src/*
-
-jobs:
-  release:
-    runs-on: ubuntu-18.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v1
-        with:
-          ref: remotes/origin/releases/v1
-      -
-        name: Git checkout
-        run: git checkout -b releases/v1
-      -
-        name: Install
-        run: npm install
-      -
-        name: Build
-        run: npm run build
-      -
-        name: Not ignore node_modules
-        run: sed -i '/node_modules*/d' .gitignore
-      -
-        name: Install production deps
-        run: |
-          rm -rf node_modules
-          npm install --production
-      -
-        name: Setup Git
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          git config user.name "${GITHUB_ACTOR}"
-          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-          git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
-      -
-        name: Git commit
-        run: |
-          git add -A
-          DIFF=`git diff --cached --numstat | wc -l`
-          if [ $DIFF -eq 0 ]; then
-            exit 0
-          fi
-          git commit -am 'Build for release'
-      -
-        name: Git push
-        run: git push origin HEAD
-
-  check:
-    runs-on: ubuntu-18.04
-    needs: release
-    strategy:
-      matrix:
-        version:
-          - latest
-          - v0.2.2
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v1
-      -
-        name: Set up Docker Buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@releases/v1
-        with:
-          version: ${{ matrix.version }}
-      -
-        name: Available platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
-      -
-        name: Run Buildx
-        run: |
-          docker buildx build \
-            --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \
-            --output "type=image,push=false" \
-            --file ./test/Dockerfile ./test

.dockerignore

@@ -0,0 +1,6 @@
+/.dev
+/coverage
+/dist
+/lib
+/node_modules
+/.env

.github/CONTRIBUTING.md

@@ -6,14 +6,15 @@ Contributions to this project are [released](https://help.github.com/articles/gi
 
 ## Submitting a pull request
 
-1. [Fork](https://github.com/crazy-max/ghaction-docker-buildx-bake/fork) and clone the repository
+1. [Fork](https://github.com/docker/bake-action/fork) and clone the repository
 2. Configure and install the dependencies: `yarn install`
-3. Make sure the tests pass on your machine: `yarn run test`
+3. Create a new branch: `git checkout -b my-branch-name`
-4. Create a new branch: `git checkout -b my-branch-name`
+4. Make your changes
-5. Make your change, add tests, and make sure the tests still pass
+5. Make sure the tests pass: `docker buildx bake test`
-6. Run pre-checkin: `yarn run pre-checkin`
+6. Format code and build javascript artifacts: `docker buildx bake pre-checkin`
-7. Push to your fork and [submit a pull request](https://github.com/crazy-max/ghaction-docker-buildx-bake/compare)
+7. Validate all code has correctly formatted and built: `docker buildx bake validate`
-8. Pat your self on the back and wait for your pull request to be reviewed and merged.
+8. Push to your fork and [submit a pull request](https://github.com/docker/bake-action/compare)
+9. Pat your self on the back and wait for your pull request to be reviewed and merged.
 
 Here are a few things you can do that will increase the likelihood of your pull request being accepted:
 

.github/SUPPORT.md

@@ -1,10 +1,10 @@
-# Support [![](https://isitmaintained.com/badge/resolution/crazy-max/ghaction-docker-buildx-bake.svg)](https://isitmaintained.com/project/crazy-max/ghaction-docker-buildx-bake)
+# Support [![](https://isitmaintained.com/badge/resolution/docker/bake-action.svg)](https://isitmaintained.com/project/docker/bake-action)
 
 First, [be a good guy](https://github.com/kossnocorp/etiquette/blob/master/README.md).
 
 ## Reporting an issue
 
-Please do a search in [open issues](https://github.com/crazy-max/ghaction-docker-buildx-bake/issues?utf8=%E2%9C%93&q=) to see if the issue or feature request has already been filed.
+Please do a search in [open issues](https://github.com/docker/bake-action/issues?utf8=%E2%9C%93&q=) to see if the issue or feature request has already been filed.
 
 If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment.
 
@@ -23,7 +23,7 @@ File a single issue per problem and feature request.
 
 The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix.
 
-You are now ready to [create a new issue](https://github.com/crazy-max/ghaction-docker-buildx-bake/issues/new/choose)!
+You are now ready to [create a new issue](https://github.com/docker/bake-action/issues/new/choose)!
 
 ## Closure policy
 

.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - ":hand: hold"
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+# Label to use when marking an issue as stale
+staleLabel: ":skull: stale"
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

.github/workflows/labels.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
       -
         name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@v3.1.0
+        uses: crazy-max/ghaction-github-labeler@v3

.github/workflows/test.yml

@@ -3,10 +3,15 @@ name: test
 on:
   push:
     branches:
-      - master
+      - 'master'
+      - 'releases/v*'
+    paths-ignore:
+      - '**.md'
   pull_request:
     branches:
-      - master
+      - 'master'
+    paths-ignore:
+      - '**.md'
 
 jobs:
   test:
@@ -14,17 +19,13 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
-      -
-        name: Install
-        run: yarn install
       -
         name: Test
-        run: yarn run test
+        run: docker buildx bake test
       -
         name: Upload coverage
-        uses: codecov/codecov-action@v1.0.13
+        uses: codecov/codecov-action@v1
-        if: success()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage/clover.xml

.github/workflows/validate.yml

@@ -0,0 +1,25 @@
+name: validate
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'releases/v*'
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    branches:
+      - 'master'
+    paths-ignore:
+      - '**.md'
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Validate
+        run: docker buildx bake validate

.gitignore

@@ -1,3 +1,4 @@
+/.dev
 node_modules
 lib
 

Dockerfile.dev

@@ -0,0 +1,59 @@
+#syntax=docker/dockerfile:1.2
+
+FROM node:12 AS deps
+WORKDIR /src
+COPY package.json yarn.lock ./
+RUN --mount=type=cache,target=/src/node_modules \
+  yarn install
+
+FROM scratch AS update-yarn
+COPY --from=deps /src/yarn.lock /
+
+FROM deps AS validate-yarn
+COPY .git .git
+RUN status=$(git status --porcelain -- yarn.lock); if [ -n "$status" ]; then echo $status; exit 1; fi
+
+FROM deps AS base
+COPY . .
+
+FROM base AS build
+RUN --mount=type=cache,target=/src/node_modules \
+  yarn build
+
+FROM deps AS test
+COPY --from=docker /usr/local/bin/docker /usr/bin/
+ARG TARGETOS
+ARG TARGETARCH
+ENV RUNNER_TEMP=/tmp/github_runner
+ENV RUNNER_TOOL_CACHE=/tmp/github_tool_cache
+ARG BUILDX_VERSION=v0.5.1
+RUN mkdir -p /usr/local/lib/docker/cli-plugins \
+  && curl -fsSL https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.$TARGETOS-$TARGETARCH > /usr/local/lib/docker/cli-plugins/docker-buildx \
+  && chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx \
+  && docker buildx version
+COPY . .
+RUN --mount=type=cache,target=/src/node_modules \
+  yarn run test
+
+FROM scratch AS test-coverage
+COPY --from=test /src/coverage /coverage/
+
+FROM base AS run-format
+RUN --mount=type=cache,target=/src/node_modules \
+  yarn run format
+
+FROM scratch AS format
+COPY --from=run-format /src/src/*.ts /src/
+
+FROM base AS validate-format
+RUN --mount=type=cache,target=/src/node_modules \
+  yarn run format-check
+
+FROM scratch AS dist
+COPY --from=build /src/dist/ /dist/
+
+FROM build AS validate-build
+RUN status=$(git status --porcelain -- dist); if [ -n "$status" ]; then echo $status; exit 1; fi
+
+FROM base AS dev
+ENTRYPOINT ["bash"]

README.md

@@ -1,16 +1,18 @@
-[![GitHub release](https://img.shields.io/github/release/crazy-max/ghaction-docker-buildx-bake.svg?style=flat-square)](https://github.com/crazy-max/ghaction-docker-buildx-bake/releases/latest)
+[![GitHub release](https://img.shields.io/github/release/docker/bake-action.svg?style=flat-square)](https://github.com/docker/bake-action/releases/latest)
 [![GitHub marketplace](https://img.shields.io/badge/marketplace-docker--buildx--bake-blue?logo=github&style=flat-square)](https://github.com/marketplace/actions/docker-buildx-bake)
-[![Test workflow](https://img.shields.io/github/workflow/status/crazy-max/ghaction-docker-buildx-bake/test?label=test&logo=github&style=flat-square)](https://github.com/crazy-max/ghaction-docker-buildx-bake/actions?workflow=test)
+[![Test workflow](https://img.shields.io/github/workflow/status/docker/bake-action/test?label=test&logo=github&style=flat-square)](https://github.com/docker/bake-action/actions?workflow=test)
-[![Codecov](https://img.shields.io/codecov/c/github/crazy-max/ghaction-docker-buildx-bake?logo=codecov&style=flat-square)](https://codecov.io/gh/crazy-max/ghaction-docker-buildx-bake)
+[![Codecov](https://img.shields.io/codecov/c/github/docker/bake-action?logo=codecov&style=flat-square)](https://codecov.io/gh/docker/bake-action)
-[![Become a sponsor](https://img.shields.io/badge/sponsor-crazy--max-181717.svg?logo=github&style=flat-square)](https://github.com/sponsors/crazy-max)
+
-[![Paypal Donate](https://img.shields.io/badge/donate-paypal-00457c.svg?logo=paypal&style=flat-square)](https://www.paypal.me/crazyws)
+## :test_tube: Experimental
+
+This repository is considered **EXPERIMENTAL** and under active development until further notice. It is subject to
+non-backward compatible changes or removal in any future version so you should [pin to a specific tag/commit](https://docs.github.com/en/actions/creating-actions/about-actions#using-tags-for-release-management)
+of  this action in your workflow (i.e `docker/bake-action@v1.1.3`).
 
 ## About
 
 GitHub Action to use Docker [Buildx Bake](https://github.com/docker/buildx#buildx-bake-options-target) as a high-level build command.
 
-If you are interested, [check out](https://git.io/Je09Y) my other :octocat: GitHub Actions!
-
 ___
 
 * [Usage](#usage)
@@ -18,8 +20,6 @@ ___
   * [inputs](#inputs)
 * [Keep up-to-date with GitHub Dependabot](#keep-up-to-date-with-github-dependabot)
 * [Limitation](#limitation)
-* [How can I help?](#how-can-i-help)
-* [License](#license)
 
 ## Usage
 
@@ -31,6 +31,7 @@ on:
   push:
     branches: master
     tags:
+
 jobs:
   bake:
     runs-on: ubuntu-latest
@@ -43,7 +44,6 @@ jobs:
         uses: docker/setup-qemu-action@v1
       -
         name: Set up Docker Buildx
-        id: buildx
         uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
@@ -53,15 +53,13 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
-        uses: crazy-max/ghaction-docker-buildx-bake@v1
+        uses: docker/bake-action@master
         with:
-          builder: ${{ steps.buildx.outputs.name }}
-          push: true
           files: |
             ./config.hcl
           targets: |
-            default
             release
+          push: true
 ```
 
 ## Customizing
@@ -70,28 +68,7 @@ jobs:
 
 Following inputs can be used as `step.with` keys
 
-| Name             | Type    | Description                        |
+> `List` type is a newline-delimited string
-|------------------|---------|------------------------------------|
-| `builder`        | String  | Builder instance (see [setup-buildx](https://github.com/docker/setup-buildx-action) action) |
-| `files`          | List    | List of [bake definition files](https://github.com/docker/buildx#file-definition) |
-| `targets`        | List    | 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`) |
-| `load`           | Bool    | Load is a shorthand for `--set=*.output=type=docker` (default `false`) |
-| `push`           | Bool    | Push is a shorthand for `--set=*.output=type=registry` (default `false`) |
-| `set`            | CSV     | List of [targets values to override](https://github.com/docker/buildx#--set-targetpatternkeysubkeyvalue) (eg: `targetpattern.key=value`) |
-
-> `List` type can be a comma or newline-delimited string
-> ```yaml
-> targets: default,release
-> ```
-> ```yaml
-> targets: |
->   default
->   release
-> ```
-
-> `CSV` type must be a newline-delimited string
 > ```yaml
 > set: target.args.mybuildarg=value
 > ```
@@ -101,6 +78,22 @@ Following inputs can be used as `step.with` keys
 >   foo*.args.mybuildarg=value
 > ```
 
+> `CSV` type is a comma-delimited string
+> ```yaml
+> targets: default,release
+> ```
+
+| Name             | Type     | Description                        |
+|------------------|----------|------------------------------------|
+| `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#file-definition) |
+| `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`) |
+| `load`           | Bool     | Load is a shorthand for `--set=*.output=type=docker` (default `false`) |
+| `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#--set-targetpatternkeysubkeyvalue) (eg: `targetpattern.key=value`) |
+
 ## Keep up-to-date with GitHub Dependabot
 
 Since [Dependabot](https://docs.github.com/en/github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot)
@@ -120,16 +113,3 @@ updates:
 ## Limitation
 
 This action is only available for Linux [virtual environments](https://help.github.com/en/articles/virtual-environments-for-github-actions#supported-virtual-environments-and-hardware-resources).
-
-## How can I help?
-
-All kinds of contributions are welcome :raised_hands:! The most basic way to show your support is to star :star2:
-the project, or to raise issues :speech_balloon: You can also support this project by
-[**becoming a sponsor on GitHub**](https://github.com/sponsors/crazy-max) :clap: or by making a
-[Paypal donation](https://www.paypal.me/crazyws) to ensure this journey continues indefinitely! :rocket:
-
-Thanks again for your support, it is much appreciated! :pray:
-
-## License
-
-MIT. See `LICENSE` for more details.

__tests__/context.test.ts

@@ -1,68 +1,156 @@
 import * as context from '../src/context';
 
 describe('getInputList', () => {
-  it('handles single line correctly', async () => {
+  it('single line correctly', async () => {
     await setInput('foo', 'bar');
     const res = await context.getInputList('foo');
     console.log(res);
     expect(res).toEqual(['bar']);
   });
 
-  it('handles multiple lines correctly', async () => {
+  it('multiline correctly', async () => {
     setInput('foo', 'bar\nbaz');
     const res = await context.getInputList('foo');
     console.log(res);
     expect(res).toEqual(['bar', 'baz']);
   });
 
-  it('remove empty lines correctly', async () => {
+  it('empty lines correctly', async () => {
     setInput('foo', 'bar\n\nbaz');
     const res = await context.getInputList('foo');
     console.log(res);
     expect(res).toEqual(['bar', 'baz']);
   });
 
-  it('handles comma correctly', async () => {
+  it('comma correctly', async () => {
     setInput('foo', 'bar,baz');
     const res = await context.getInputList('foo');
     console.log(res);
     expect(res).toEqual(['bar', 'baz']);
   });
 
-  it('remove empty result correctly', async () => {
+  it('empty result correctly', async () => {
     setInput('foo', 'bar,baz,');
     const res = await context.getInputList('foo');
     console.log(res);
     expect(res).toEqual(['bar', 'baz']);
   });
 
-  it('handles different new lines correctly', async () => {
+  it('different new lines correctly', async () => {
     setInput('foo', 'bar\r\nbaz');
     const res = await context.getInputList('foo');
     console.log(res);
     expect(res).toEqual(['bar', 'baz']);
   });
 
-  it('handles different new lines and comma correctly', async () => {
+  it('different new lines and comma correctly', async () => {
     setInput('foo', 'bar\r\nbaz,bat');
     const res = await context.getInputList('foo');
     console.log(res);
     expect(res).toEqual(['bar', 'baz', 'bat']);
   });
 
-  it('handles multiple lines and ignoring comma correctly', async () => {
+  it('multiline and ignoring comma correctly', async () => {
     setInput('cache-from', 'user/app:cache\ntype=local,src=path/to/dir');
     const res = await context.getInputList('cache-from', true);
     console.log(res);
     expect(res).toEqual(['user/app:cache', 'type=local,src=path/to/dir']);
   });
 
-  it('handles different new lines and ignoring comma correctly', async () => {
+  it('different new lines and ignoring comma correctly', async () => {
     setInput('cache-from', 'user/app:cache\r\ntype=local,src=path/to/dir');
     const res = await context.getInputList('cache-from', true);
     console.log(res);
     expect(res).toEqual(['user/app:cache', 'type=local,src=path/to/dir']);
   });
+
+  it('multiline values', async () => {
+    setInput(
+      'secrets',
+      `GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789
+"MYSECRET=aaaaaaaa
+bbbbbbb
+ccccccccc"
+FOO=bar`
+    );
+    const res = await context.getInputList('secrets', true);
+    console.log(res);
+    expect(res).toEqual([
+      'GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789',
+      `MYSECRET=aaaaaaaa
+bbbbbbb
+ccccccccc`,
+      'FOO=bar'
+    ]);
+  });
+
+  it('multiline values with empty lines', async () => {
+    setInput(
+      'secrets',
+      `GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789
+"MYSECRET=aaaaaaaa
+bbbbbbb
+ccccccccc"
+FOO=bar
+"EMPTYLINE=aaaa
+
+bbbb
+ccc"`
+    );
+    const res = await context.getInputList('secrets', true);
+    console.log(res);
+    expect(res).toEqual([
+      'GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789',
+      `MYSECRET=aaaaaaaa
+bbbbbbb
+ccccccccc`,
+      'FOO=bar',
+      `EMPTYLINE=aaaa
+
+bbbb
+ccc`
+    ]);
+  });
+
+  it('multiline values without quotes', async () => {
+    setInput(
+      'secrets',
+      `GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789
+MYSECRET=aaaaaaaa
+bbbbbbb
+ccccccccc
+FOO=bar`
+    );
+    const res = await context.getInputList('secrets', true);
+    console.log(res);
+    expect(res).toEqual([
+      'GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789',
+      'MYSECRET=aaaaaaaa',
+      'bbbbbbb',
+      'ccccccccc',
+      'FOO=bar'
+    ]);
+  });
+
+  it('multiline values escape quotes', async () => {
+    setInput(
+      'secrets',
+      `GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789
+"MYSECRET=aaaaaaaa
+bbbb""bbb
+ccccccccc"
+FOO=bar`
+    );
+    const res = await context.getInputList('secrets', true);
+    console.log(res);
+    expect(res).toEqual([
+      'GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789',
+      `MYSECRET=aaaaaaaa
+bbbb\"bbb
+ccccccccc`,
+      'FOO=bar'
+    ]);
+  });
 });
 
 describe('asyncForEach', () => {

action.yml

@@ -1,7 +1,7 @@
 # https://help.github.com/en/articles/metadata-syntax-for-github-actions
 name: "Docker Buildx Bake"
 description: "GitHub Action to use Docker Buildx Bake as a high-level build command"
-author: crazy-max
+author: 'docker'
 branding:
   icon: 'anchor'
   color: 'blue'
@@ -39,4 +39,3 @@ inputs:
 runs:
   using: 'node12'
   main: 'dist/index.js'
-  post: 'dist/index.js'

docker-bake.hcl

@@ -0,0 +1,54 @@
+group "default" {
+  targets = ["build"]
+}
+
+group "pre-checkin" {
+  targets = ["update-yarn", "format", "build"]
+}
+
+group "validate" {
+  targets = ["validate-format", "validate-build", "validate-yarn"]
+}
+
+target "dockerfile" {
+  dockerfile = "Dockerfile.dev"
+}
+
+target "update-yarn" {
+  inherits = ["dockerfile"]
+  target = "update-yarn"
+  output = ["."]
+}
+
+target "build" {
+  inherits = ["dockerfile"]
+  target = "dist"
+  output = ["."]
+}
+
+target "test" {
+  inherits = ["dockerfile"]
+  target = "test-coverage"
+  output = ["."]
+}
+
+target "format" {
+  inherits = ["dockerfile"]
+  target = "format"
+  output = ["."]
+}
+
+target "validate-format" {
+  inherits = ["dockerfile"]
+  target = "validate-format"
+}
+
+target "validate-build" {
+  inherits = ["dockerfile"]
+  target = "validate-build"
+}
+
+target "validate-yarn" {
+  inherits = ["dockerfile"]
+  target = "validate-yarn"
+}

package.json

@@ -11,7 +11,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/crazy-max/ghaction-docker-buildx-bake.git"
+    "url": "git+https://github.com/docker/bake-action.git"
   },
   "keywords": [
     "actions",
@@ -19,7 +19,7 @@
     "buildx",
     "bake"
   ],
-  "author": "CrazyMax",
+  "author": "Docker",
   "contributors": [
     {
       "name": "CrazyMax",
@@ -30,9 +30,8 @@
   "dependencies": {
     "@actions/core": "^1.2.6",
     "@actions/exec": "^1.0.4",
-    "@actions/github": "^4.0.0",
+    "csv-parse": "^4.15.0",
-    "semver": "^7.3.2",
+    "semver": "^7.3.4"
-    "tmp": "^0.2.1"
   },
   "devDependencies": {
     "@types/jest": "^26.0.3",

src/context.ts

@@ -1,3 +1,4 @@
+import csvparse from 'csv-parse/lib/sync';
 import * as buildx from './buildx';
 import * as core from '@actions/core';
 
@@ -15,13 +16,13 @@ export interface Inputs {
 export async function getInputs(): Promise<Inputs> {
   return {
     builder: core.getInput('builder'),
-    files: await getInputList('files'),
+    files: getInputList('files'),
-    targets: await getInputList('targets'),
+    targets: getInputList('targets'),
     noCache: /true/i.test(core.getInput('no-cache')),
     pull: /true/i.test(core.getInput('pull')),
     load: /true/i.test(core.getInput('load')),
     push: /true/i.test(core.getInput('push')),
-    set: await getInputList('set', true)
+    set: getInputList('set', true)
   };
 }
 
@@ -64,18 +65,30 @@ async function getCommonArgs(inputs: Inputs): Promise<Array<string>> {
   return args;
 }
 
-export async function getInputList(name: string, ignoreComma?: boolean): Promise<string[]> {
+export function getInputList(name: string, ignoreComma?: boolean): string[] {
+  let res: Array<string> = [];
+
   const items = core.getInput(name);
   if (items == '') {
-    return [];
+    return res;
   }
-  return items
+
-    .split(/\r?\n/)
+  for (let output of csvparse(items, {
-    .filter(x => x)
+    columns: false,
-    .reduce<string[]>(
+    relaxColumnCount: true,
-      (acc, line) => acc.concat(!ignoreComma ? line.split(',').filter(x => x) : line).map(pat => pat.trim()),
+    skipLinesWithEmptyValues: true
-      []
+  }) as Array<string[]>) {
-    );
+    if (output.length == 1) {
+      res.push(output[0]);
+      continue;
+    } else if (!ignoreComma) {
+      res.push(...output);
+      continue;
+    }
+    res.push(output.join(','));
+  }
+
+  return res.filter(item => item).map(pat => pat.trim());
 }
 
 export const asyncForEach = async (array, callback) => {

src/main.ts

@@ -20,9 +20,13 @@ async function run(): Promise<void> {
     core.info(`📣 Buildx version: ${buildxVersion}`);
 
     let inputs: context.Inputs = await context.getInputs();
-
-    core.info(`🏃 Starting bake...`);
     const args: string[] = await context.getArgs(inputs, buildxVersion);
+
+    core.startGroup(`💡 Bake definition`);
+    await exec.exec('docker', [...args, '--print']);
+    core.endGroup();
+
+    core.info(`🏃 Building...`);
     await exec.exec('docker', args);
   } catch (error) {
     core.setFailed(error.message);