Merge branch 'v2-working-branch' into v2-build-push

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

.github/workflows/setup-buildx-ci.yml

@@ -27,12 +27,6 @@ jobs:
           - v0.2.2
           - ""
     steps:
-      -
-        name: Runner info
-        run: |
-          sudo apt-get install -y hwinfo
-          sudo hwinfo --short
-          sudo mount
       -
         name: Checkout
         uses: actions/checkout@v2.3.1

.github/workflows/setup-qemu-ci.yml

@@ -29,12 +29,6 @@ jobs:
           - all
           - arm64,riscv64,arm
     steps:
-      -
-        name: Runner info
-        run: |
-          sudo apt-get install -y hwinfo
-          sudo hwinfo --short
-          sudo mount
       -
         name: Checkout
         uses: actions/checkout@v2.3.1

setup-buildx/README.md

@@ -37,7 +37,7 @@ jobs:
       -
         name: Set up Docker Buildx
         id: buildx
-        uses: docker/actions/setup-buildx@v1
+        uses: docker/setup-buildx-action@v1
         with:
           version: latest
       -
@@ -71,13 +71,13 @@ jobs:
         uses: actions/checkout@v2
       -
         name: Set up QEMU
-        uses: docker/actions/setup-qemu@v1
+        uses: docker/setup-qemu-action@v1
         with:
           platforms: all
       -
         name: Set up Docker Buildx
         id: buildx
-        uses: docker/actions/setup-buildx@v1
+        uses: docker/setup-buildx-action@v1
         with:
           version: latest
       -
@@ -91,13 +91,14 @@ jobs:
 
 Following inputs can be used as `step.with` keys
 
-| Name             | Type    | Default                           | Description                        |
-|------------------|---------|-----------------------------------|------------------------------------|
-| `version`        | String  | _the one installed on the runner_ | [Buildx](https://github.com/docker/buildx) version. e.g. `v0.3.0`, `latest` |
-| `driver`         | String  | `docker-container`                | Sets the [builder driver](https://github.com/docker/buildx#--driver-driver) to be used. |
-| `driver-opt`     | String  |                                   | Passes additional [driver-specific options](https://github.com/docker/buildx#--driver-opt-options). e.g. `image=moby/buildkit:master` |
-| `install`        | Bool    | `false`                           | Sets up `docker build` command as an alias to `docker buildx` |
-| `use`            | Bool    | `true`                            | Switch to this builder instance |
+| Name               | Type    | Default                           | Description                        |
+|--------------------|---------|-----------------------------------|------------------------------------|
+| `version`          | String  | _the one installed on the runner_ | [Buildx](https://github.com/docker/buildx) version. e.g. `v0.3.0`, `latest` |
+| `driver`           | String  | `docker-container`                | Sets the [builder driver](https://github.com/docker/buildx#--driver-driver) to be used. |
+| `driver-opt`       | String  |                                   | Passes additional [driver-specific options](https://github.com/docker/buildx#--driver-opt-options). e.g. `image=moby/buildkit:master` |
+| `buildkitd-flags`  | String  |                                   | [Flags for buildkitd](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md) daemon. |
+| `install`          | Bool    | `false`                           | Sets up `docker build` command as an alias to `docker buildx` |
+| `use`              | Bool    | `true`                            | Switch to this builder instance |
 
 ### outputs
 

setup-buildx/__tests__/buildx.test.ts

@@ -8,20 +8,20 @@ const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'setup-buildx-'));
 describe('buildx', () => {
   it('is available', async () => {
     expect(await buildx.isAvailable()).toBe(true);
-  });
+  }, 100000);
 
   it('count builders', async () => {
     const countBuilders = await buildx.countBuilders();
     console.log(`countBuilders: ${countBuilders}`);
     expect(countBuilders).toBeGreaterThan(0);
-  });
+  }, 100000);
 
   it('platforms', async () => {
     const platforms = await buildx.platforms();
     console.log(`platforms: ${platforms}`);
     expect(platforms).not.toBeUndefined();
     expect(platforms).not.toEqual('');
-  });
+  }, 100000);
 
   it('acquires v0.2.2 version of buildx', async () => {
     const buildxBin = await buildx.install('v0.2.2', tmpDir);

setup-buildx/action.yml

@@ -1,10 +1,10 @@
 # https://help.github.com/en/articles/metadata-syntax-for-github-actions
-name: 'Docker - Setup Buildx'
-description: 'GitHub Action to set up Docker Buildx'
-author: 'crazy-max'
+name: 'Docker Setup Buildx'
+description: 'Set up Docker Buildx'
+author: 'docker'
 branding:
+  icon: 'anchor'
   color: 'blue'
-  icon: 'truck'
 
 inputs:
   version:
@@ -17,6 +17,9 @@ inputs:
   driver-opt:
     description: 'Passes additional driver-specific options. Eg. image=moby/buildkit:master'
     required: false
+  buildkitd-flags:
+    description: 'Flags for buildkitd daemon'
+    required: false
   install:
     description: 'Sets up docker build command as an alias to docker buildx'
     default: 'false'

setup-buildx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-buildx",
-  "description": "GitHub Action to set up Docker Buildx",
+  "description": "Set up Docker Buildx",
   "main": "lib/main.js",
   "scripts": {
     "build": "tsc && ncc build",
@@ -11,15 +11,17 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/docker/actions.git",
-    "directory": "setup-buildx"
+    "url": "git+https://github.com/docker/setup-buildx-action.git"
   },
   "keywords": [
     "actions",
     "docker",
     "buildx"
   ],
-  "author": "CrazyMax",
+  "author": "Docker",
+  "contributors": [
+    "CrazyMax"
+  ],
   "license": "Apache-2.0",
   "dependencies": {
     "@actions/core": "^1.2.4",

setup-buildx/src/exec.ts

@@ -1,4 +1,4 @@
-import * as actionsExec from '@actions/exec';
+import * as aexec from '@actions/exec';
 import {ExecOptions} from '@actions/exec';
 
 export interface ExecResult {
@@ -24,7 +24,7 @@ export const exec = async (command: string, args: string[] = [], silent: boolean
     }
   };
 
-  const returnCode: number = await actionsExec.exec(command, args, options);
+  const returnCode: number = await aexec.exec(command, args, options);
 
   return {
     success: returnCode === 0,