Merge pull request #46 from crazy-max/disable-clipping

Tweak BuildKit step log limits

.github/workflows/ci.yml

@@ -22,12 +22,12 @@ jobs:
       matrix:
         buildx-version:
           - latest
-          - v0.2.2
+          - v0.4.1
           - ""
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
       -
         name: Set up Docker Buildx
         id: buildx
@@ -49,7 +49,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
       -
         name: Set up Docker Buildx 1
         id: buildx1
@@ -70,7 +70,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
       -
         name: Set up Docker Buildx
         uses: ./
@@ -92,7 +92,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
       -
         name: Set up Docker Buildx
         uses: ./
@@ -115,7 +115,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
       -
         name: Set up Docker Buildx
         uses: ./
@@ -128,7 +128,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
       -
         name: Set up Docker Buildx
         uses: ./
@@ -161,7 +161,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
       -
         name: Create context
         run: |
@@ -183,7 +183,7 @@ jobs:
       matrix:
         buildx-version:
           - latest
-          - v0.2.2
+          - v0.4.1
           - ""
         qemu-platforms:
           - all
@@ -191,7 +191,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.0.0
+        uses: crazy-max/ghaction-github-labeler@v3

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
       -
         name: Validate
         run: docker buildx bake validate
@@ -30,7 +30,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v2
       -
         name: Install
         run: yarn install
@@ -39,7 +39,7 @@ jobs:
         run: yarn run test
       -
         name: Upload coverage
-        uses: codecov/codecov-action@v1.0.13
+        uses: codecov/codecov-action@v1
         if: success()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

README.md

@@ -49,8 +49,6 @@ jobs:
         name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
-        with:
-          version: latest
       -
         name: Builder instance name
         run: echo ${{ steps.buildx.outputs.name }}
@@ -79,14 +77,10 @@ jobs:
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-        with:
-          platforms: all
       -
         name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
-        with:
-          version: latest
       -
         name: Available platforms
         run: echo ${{ steps.buildx.outputs.platforms }}

__tests__/buildx.test.ts

@@ -41,18 +41,10 @@ describe('platforms', () => {
   );
 });
 
-describe('countBuilders', () => {
-  it('valid', async () => {
-    const countBuilders = await buildx.countBuilders();
-    console.log(`countBuilders: ${countBuilders}`);
-    expect(countBuilders).toBeGreaterThan(0);
-  }, 100000);
-});
-
 describe('install', () => {
   const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'setup-buildx-'));
-  it('acquires v0.2.2 version of buildx', async () => {
-    const buildxBin = await buildx.install('v0.2.2', tmpDir);
+  it('acquires v0.4.1 version of buildx', async () => {
+    const buildxBin = await buildx.install('v0.4.1', tmpDir);
     console.log(buildxBin);
     expect(fs.existsSync(buildxBin)).toBe(true);
   }, 100000);

package.json

@@ -29,9 +29,10 @@
   "dependencies": {
     "@actions/core": "^1.2.6",
     "@actions/exec": "^1.0.4",
-    "@actions/http-client": "^1.0.8",
-    "@actions/tool-cache": "^1.5.5",
-    "semver": "^7.3.2"
+    "@actions/http-client": "^1.0.9",
+    "@actions/tool-cache": "^1.6.1",
+    "semver": "^7.3.4",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@types/jest": "^26.0.3",

src/buildx.ts

@@ -34,15 +34,6 @@ export async function isAvailable(): Promise<Boolean> {
   });
 }
 
-export async function countBuilders(): Promise<number> {
-  return await exec.exec(`docker`, ['buildx', 'ls'], true).then(res => {
-    if (res.stderr != '' && !res.success) {
-      throw new Error(`Cannot list builders: ${res.stderr}`);
-    }
-    return (res.stdout.trim().split(`\n`).length - 1) / 2;
-  });
-}
-
 export async function platforms(): Promise<String | undefined> {
   return await exec.exec(`docker`, ['buildx', 'inspect'], true).then(res => {
     if (res.stderr != '' && !res.success) {

src/main.ts

@@ -8,6 +8,9 @@ import * as context from './context';
 import * as mexec from './exec';
 import * as stateHelper from './state-helper';
 
+const buildkitStepLogMaxSize = 1024 * 8192;
+const buildkitStepLogMaxSpeed = -1;
+
 async function run(): Promise<void> {
   try {
     if (os.platform() !== 'linux') {
@@ -19,25 +22,30 @@ async function run(): Promise<void> {
     const dockerConfigHome: string = process.env.DOCKER_CONFIG || path.join(os.homedir(), '.docker');
 
     if (!(await buildx.isAvailable()) || inputs.version) {
+      core.startGroup(`👉 Installing Buildx`);
       await buildx.install(inputs.version || 'latest', dockerConfigHome);
+      core.endGroup();
     }
 
     const buildxVersion = await buildx.getVersion();
     core.info(`📣 Buildx version: ${buildxVersion}`);
 
-    const builderName: string =
-      inputs.driver == 'docker' ? 'default' : `builder-${process.env.GITHUB_JOB}-${(await buildx.countBuilders()) + 1}`;
+    const builderName: string = inputs.driver == 'docker' ? 'default' : `builder-${require('uuid').v4()}`;
     core.setOutput('name', builderName);
     stateHelper.setBuilderName(builderName);
 
     if (inputs.driver !== 'docker') {
-      core.info('🔨 Creating a new builder instance...');
+      core.startGroup(`🔨 Creating a new builder instance`);
       let createArgs: Array<string> = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
-      await context.asyncForEach(inputs.driverOpts, async driverOpt => {
-        createArgs.push('--driver-opt', driverOpt);
-      });
-      if (inputs.buildkitdFlags && semver.satisfies(buildxVersion, '>=0.3.0')) {
-        createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
+      if (semver.satisfies(buildxVersion, '>=0.3.0')) {
+        await context.asyncForEach(inputs.driverOpts, async driverOpt => {
+          createArgs.push('--driver-opt', driverOpt);
+        });
+        createArgs.push('--driver-opt', 'env.BUILDKIT_STEP_LOG_MAX_SIZE=' + buildkitStepLogMaxSize);
+        createArgs.push('--driver-opt', 'env.BUILDKIT_STEP_LOG_MAX_SPEED=' + buildkitStepLogMaxSpeed);
+        if (inputs.buildkitdFlags) {
+          createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
+        }
       }
       if (inputs.use) {
         createArgs.push('--use');
@@ -46,20 +54,28 @@ async function run(): Promise<void> {
         createArgs.push(inputs.endpoint);
       }
       await exec.exec('docker', createArgs);
+      core.endGroup();
 
-      core.info('🏃 Booting builder...');
-      await exec.exec('docker', ['buildx', 'inspect', '--bootstrap']);
+      core.startGroup(`🏃 Booting builder`);
+      let bootstrapArgs: Array<string> = ['buildx', 'inspect', '--bootstrap'];
+      if (semver.satisfies(buildxVersion, '>=0.4.0')) {
+        bootstrapArgs.push('--builder', builderName);
+      }
+      await exec.exec('docker', bootstrapArgs);
+      core.endGroup();
     }
 
     if (inputs.install) {
-      core.info('🤝 Setting buildx as default builder...');
+      core.startGroup(`🤝 Setting buildx as default builder`);
       await exec.exec('docker', ['buildx', 'install']);
+      core.endGroup();
     }
 
-    core.info('🛒 Extracting available platforms...');
+    core.startGroup(`🛒 Extracting available platforms`);
     const platforms = await buildx.platforms();
     core.info(`${platforms}`);
     core.setOutput('platforms', platforms);
+    core.endGroup();
   } catch (error) {
     core.setFailed(error.message);
   }

yarn.lock

@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@actions/core@^1.2.3", "@actions/core@^1.2.6":
+"@actions/core@^1.2.6":
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.2.6.tgz#a78d49f41a4def18e88ce47c2cac615d5694bf09"
   integrity sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==
@@ -14,10 +14,10 @@
   dependencies:
     "@actions/io" "^1.0.1"
 
-"@actions/http-client@^1.0.8":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.8.tgz#8bd76e8eca89dc8bcf619aa128eba85f7a39af45"
-  integrity sha512-G4JjJ6f9Hb3Zvejj+ewLLKLf99ZC+9v+yCxoYf9vSyH+WkzPLB2LuUtRMGNkooMqdugGBFStIKXOuvH1W+EctA==
+"@actions/http-client@^1.0.8", "@actions/http-client@^1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.9.tgz#af1947d020043dbc6a3b4c5918892095c30ffb52"
+  integrity sha512-0O4SsJ7q+MK0ycvXPl2e6bMXV7dxAXOGjrXS1eTF9s2S401Tp6c/P3c3Joz04QefC1J6Gt942Wl2jbm3f4mLcg==
   dependencies:
     tunnel "0.0.6"
 
@@ -26,12 +26,12 @@
   resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.0.2.tgz#2f614b6e69ce14d191180451eb38e6576a6e6b27"
   integrity sha512-J8KuFqVPr3p6U8W93DOXlXW6zFvrQAJANdS+vw0YhusLIq+bszW8zmK2Fh1C2kDPX8FMvwIl1OUcFgvJoXLbAg==
 
-"@actions/tool-cache@^1.5.5":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-1.6.0.tgz#5b425db2d642df65dd0d6bcec0d84dcdbca3f80d"
-  integrity sha512-+fyEBImPD3m5I0o6DflCO0NHY180LPoX8Lo6y4Iez+V17kO8kfkH0VHxb8mUdmD6hn9dWA9Ch1JA20fXoIYUeQ==
+"@actions/tool-cache@^1.6.1":
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-1.6.1.tgz#5e199f7bfd9863eb2b0d467cd70751ef8042ec40"
+  integrity sha512-F+vwEDwfqcHMKuSkj79pihOnsAMv23EkG76nMpc82UsnXwyQdyEsktGxrB0SNtm7pRqTXEIOoAPTgrSQclXYTg==
   dependencies:
-    "@actions/core" "^1.2.3"
+    "@actions/core" "^1.2.6"
     "@actions/exec" "^1.0.0"
     "@actions/http-client" "^1.0.8"
     "@actions/io" "^1.0.1"
@@ -2490,6 +2490,13 @@ lru-cache@^4.1.5:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 make-dir@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -3107,10 +3114,12 @@ saxes@^5.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.x, semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+semver@7.x, semver@^7.3.2, semver@^7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
 
 semver@^6.0.0, semver@^6.1.0, semver@^6.3.0:
   version "6.3.0"
@@ -3602,6 +3611,11 @@ uuid@^8.2.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
   integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
 
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 v8-to-istanbul@^4.1.3:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6"
@@ -3753,6 +3767,11 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
 yargs-parser@18.x, yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"