Merge pull request #40 from crazy-max/master

Simplify README

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
     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: |
@@ -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.1.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 }}

dist/index.js

@@ -515,7 +515,9 @@ function run() {
             const inputs = yield context.getInputs();
             const dockerConfigHome = process.env.DOCKER_CONFIG || path.join(os.homedir(), '.docker');
             if (!(yield buildx.isAvailable()) || inputs.version) {
+                core.startGroup(`👉 Installing Buildx`);
                 yield buildx.install(inputs.version || 'latest', dockerConfigHome);
+                core.endGroup();
             }
             const buildxVersion = yield buildx.getVersion();
             core.info(`📣 Buildx version: ${buildxVersion}`);
@@ -523,14 +525,24 @@ function run() {
             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 = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
+                if (semver.satisfies(buildxVersion, '>=0.3.0')) {
+                    let hasImageDriverOpt = false;
                     yield context.asyncForEach(inputs.driverOpts, (driverOpt) => __awaiter(this, void 0, void 0, function* () {
+                        if (driverOpt.startsWith('image=')) {
+                            hasImageDriverOpt = true;
+                        }
                         createArgs.push('--driver-opt', driverOpt);
                     }));
-                if (inputs.buildkitdFlags && semver.satisfies(buildxVersion, '>=0.3.0')) {
+                    if (!hasImageDriverOpt) {
+                        //FIXME: Temporary fix (docker/build-push-action#154, docker/build-push-action#162)
+                        createArgs.push('--driver-opt', 'image=moby/buildkit:v0.8-beta');
+                    }
+                    if (inputs.buildkitdFlags) {
                         createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
                     }
+                }
                 if (inputs.use) {
                     createArgs.push('--use');
                 }
@@ -538,17 +550,21 @@ function run() {
                     createArgs.push(inputs.endpoint);
                 }
                 yield exec.exec('docker', createArgs);
-                core.info('🏃 Booting builder...');
+                core.endGroup();
+                core.startGroup(`🏃 Booting builder`);
                 yield exec.exec('docker', ['buildx', 'inspect', '--bootstrap']);
+                core.endGroup();
             }
             if (inputs.install) {
-                core.info('🤝 Setting buildx as default builder...');
+                core.startGroup(`🤝 Setting buildx as default builder`);
                 yield exec.exec('docker', ['buildx', 'install']);
+                core.endGroup();
             }
-            core.info('🛒 Extracting available platforms...');
+            core.startGroup(`🛒 Extracting available platforms`);
             const platforms = yield buildx.platforms();
             core.info(`${platforms}`);
             core.setOutput('platforms', platforms);
+            core.endGroup();
         }
         catch (error) {
             core.setFailed(error.message);
@@ -2776,12 +2792,11 @@ function copyFile(srcFile, destFile, force) {
 /***/ }),
 
 /***/ 443:
-/***/ (function(__unusedmodule, exports, __webpack_require__) {
+/***/ (function(__unusedmodule, exports) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const url = __webpack_require__(835);
 function getProxyUrl(reqUrl) {
     let usingSsl = reqUrl.protocol === 'https:';
     let proxyUrl;
@@ -2796,7 +2811,7 @@ function getProxyUrl(reqUrl) {
         proxyVar = process.env['http_proxy'] || process.env['HTTP_PROXY'];
     }
     if (proxyVar) {
-        proxyUrl = url.parse(proxyVar);
+        proxyUrl = new URL(proxyVar);
     }
     return proxyUrl;
 }
@@ -6588,13 +6603,6 @@ const minSatisfying = (versions, range, options) => {
 module.exports = minSatisfying
 
 
-/***/ }),
-
-/***/ 835:
-/***/ (function(module) {
-
-module.exports = require("url");
-
 /***/ }),
 
 /***/ 842:
@@ -7000,7 +7008,6 @@ exports.getRelease = (version) => __awaiter(void 0, void 0, void 0, function* ()
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const url = __webpack_require__(835);
 const http = __webpack_require__(605);
 const https = __webpack_require__(211);
 const pm = __webpack_require__(443);
@@ -7049,7 +7056,7 @@ var MediaTypes;
  * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
  */
 function getProxyUrl(serverUrl) {
-    let proxyUrl = pm.getProxyUrl(url.parse(serverUrl));
+    let proxyUrl = pm.getProxyUrl(new URL(serverUrl));
     return proxyUrl ? proxyUrl.href : '';
 }
 exports.getProxyUrl = getProxyUrl;
@@ -7068,6 +7075,15 @@ const HttpResponseRetryCodes = [
 const RetryableHttpVerbs = ['OPTIONS', 'GET', 'DELETE', 'HEAD'];
 const ExponentialBackoffCeiling = 10;
 const ExponentialBackoffTimeSlice = 5;
+class HttpClientError extends Error {
+    constructor(message, statusCode) {
+        super(message);
+        this.name = 'HttpClientError';
+        this.statusCode = statusCode;
+        Object.setPrototypeOf(this, HttpClientError.prototype);
+    }
+}
+exports.HttpClientError = HttpClientError;
 class HttpClientResponse {
     constructor(message) {
         this.message = message;
@@ -7086,7 +7102,7 @@ class HttpClientResponse {
 }
 exports.HttpClientResponse = HttpClientResponse;
 function isHttps(requestUrl) {
-    let parsedUrl = url.parse(requestUrl);
+    let parsedUrl = new URL(requestUrl);
     return parsedUrl.protocol === 'https:';
 }
 exports.isHttps = isHttps;
@@ -7191,7 +7207,7 @@ class HttpClient {
         if (this._disposed) {
             throw new Error('Client has already been disposed.');
         }
-        let parsedUrl = url.parse(requestUrl);
+        let parsedUrl = new URL(requestUrl);
         let info = this._prepareRequest(verb, parsedUrl, headers);
         // Only perform retries on reads since writes may not be idempotent.
         let maxTries = this._allowRetries && RetryableHttpVerbs.indexOf(verb) != -1
@@ -7230,7 +7246,7 @@ class HttpClient {
                     // if there's no location to redirect to, we won't
                     break;
                 }
-                let parsedRedirectUrl = url.parse(redirectUrl);
+                let parsedRedirectUrl = new URL(redirectUrl);
                 if (parsedUrl.protocol == 'https:' &&
                     parsedUrl.protocol != parsedRedirectUrl.protocol &&
                     !this._allowRedirectDowngrade) {
@@ -7346,7 +7362,7 @@ class HttpClient {
      * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
      */
     getAgent(serverUrl) {
-        let parsedUrl = url.parse(serverUrl);
+        let parsedUrl = new URL(serverUrl);
         return this._getAgent(parsedUrl);
     }
     _prepareRequest(method, requestUrl, headers) {
@@ -7419,7 +7435,7 @@ class HttpClient {
                 maxSockets: maxSockets,
                 keepAlive: this._keepAlive,
                 proxy: {
-                    proxyAuth: proxyUrl.auth,
+                    proxyAuth: `${proxyUrl.username}:${proxyUrl.password}`,
                     host: proxyUrl.hostname,
                     port: proxyUrl.port
                 }
@@ -7514,12 +7530,8 @@ class HttpClient {
                 else {
                     msg = 'Failed request: (' + statusCode + ')';
                 }
-                let err = new Error(msg);
+                let err = new HttpClientError(msg, statusCode);
-                // attach statusCode and body obj (if available) to the error object
+                err.result = response.result;
-                err['statusCode'] = statusCode;
-                if (response.result) {
-                    err['result'] = response.result;
-                }
                 reject(err);
             }
             else {

package.json

@@ -29,8 +29,8 @@
   "dependencies": {
     "@actions/core": "^1.2.6",
     "@actions/exec": "^1.0.4",
-    "@actions/http-client": "^1.0.8",
+    "@actions/http-client": "^1.0.9",
-    "@actions/tool-cache": "^1.5.5",
+    "@actions/tool-cache": "^1.6.1",
     "semver": "^7.3.2"
   },
   "devDependencies": {

src/main.ts

@@ -19,7 +19,9 @@ 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();
@@ -31,14 +33,24 @@ async function run(): Promise<void> {
     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];
+      if (semver.satisfies(buildxVersion, '>=0.3.0')) {
+        let hasImageDriverOpt: boolean = false;
         await context.asyncForEach(inputs.driverOpts, async driverOpt => {
+          if (driverOpt.startsWith('image=')) {
+            hasImageDriverOpt = true;
+          }
           createArgs.push('--driver-opt', driverOpt);
         });
-      if (inputs.buildkitdFlags && semver.satisfies(buildxVersion, '>=0.3.0')) {
+        if (!hasImageDriverOpt) {
+          //FIXME: Temporary fix (docker/build-push-action#154, docker/build-push-action#162)
+          createArgs.push('--driver-opt', 'image=moby/buildkit:v0.8-beta');
+        }
+        if (inputs.buildkitdFlags) {
           createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
         }
+      }
       if (inputs.use) {
         createArgs.push('--use');
       }
@@ -46,20 +58,24 @@ async function run(): Promise<void> {
         createArgs.push(inputs.endpoint);
       }
       await exec.exec('docker', createArgs);
+      core.endGroup();
 
-      core.info('🏃 Booting builder...');
+      core.startGroup(`🏃 Booting builder`);
       await exec.exec('docker', ['buildx', 'inspect', '--bootstrap']);
+      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":
+"@actions/http-client@^1.0.8", "@actions/http-client@^1.0.9":
-  version "1.0.8"
+  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.8.tgz#8bd76e8eca89dc8bcf619aa128eba85f7a39af45"
+  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.9.tgz#af1947d020043dbc6a3b4c5918892095c30ffb52"
-  integrity sha512-G4JjJ6f9Hb3Zvejj+ewLLKLf99ZC+9v+yCxoYf9vSyH+WkzPLB2LuUtRMGNkooMqdugGBFStIKXOuvH1W+EctA==
+  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":
+"@actions/tool-cache@^1.6.1":
-  version "1.6.0"
+  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-1.6.0.tgz#5b425db2d642df65dd0d6bcec0d84dcdbca3f80d"
+  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-1.6.1.tgz#5e199f7bfd9863eb2b0d467cd70751ef8042ec40"
-  integrity sha512-+fyEBImPD3m5I0o6DflCO0NHY180LPoX8Lo6y4Iez+V17kO8kfkH0VHxb8mUdmD6hn9dWA9Ch1JA20fXoIYUeQ==
+  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"