Merge pull request #40 from crazy-max/master

Simplify README
2025-06-26 12:41:09 +02:00 · 2020-11-18 18:31:41 +01:00 · 2020-11-18 18:30:28 +01:00 · 2020-11-18 18:28:13 +01:00 · 2020-11-18 18:25:03 +01:00 · 2020-11-18 18:19:55 +01:00
9 changed files with 64 additions and 62 deletions
--- a/.github/setup-buildx-action.png
+++ b/.github/setup-buildx-action.png
--- a/.github/workflows/ci.yml
+++ b/.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
--- a/.github/workflows/labels.yml
+++ b/.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
--- a/.github/workflows/test.yml
+++ b/.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 }}
--- a/README.md
+++ b/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 }}
--- a/dist/index.js
+++ b/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,7 +525,7 @@ 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;
@ -548,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);
@ -2786,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;
@ -2806,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;
 }
@ -6598,13 +6603,6 @@ const minSatisfying = (versions, range, options) => {
 module.exports = minSatisfying


-/***/ }),
-
-/***/ 835:
-/***/ (function(module) {
-
-module.exports = require("url");
-
 /***/ }),

 /***/ 842:
@ -7010,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);
@ -7059,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;
@ -7078,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;
@ -7096,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;
@ -7201,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
@ -7240,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) {
@ -7356,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) {
@ -7429,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
                }
@ -7524,12 +7530,8 @@ class HttpClient {
                else {
                    msg = 'Failed request: (' + statusCode + ')';
                }
-                let err = new Error(msg);
-                // attach statusCode and body obj (if available) to the error object
-                err['statusCode'] = statusCode;
-                if (response.result) {
-                    err['result'] = response.result;
-                }
+                let err = new HttpClientError(msg, statusCode);
+                err.result = response.result;
                reject(err);
            }
            else {
--- a/package.json
+++ b/package.json
@ -29,8 +29,8 @@
  "dependencies": {
    "@actions/core": "^1.2.6",
    "@actions/exec": "^1.0.4",
-    "@actions/http-client": "^1.0.8",
-    "@actions/tool-cache": "^1.5.5",
+    "@actions/http-client": "^1.0.9",
+    "@actions/tool-cache": "^1.6.1",
    "semver": "^7.3.2"
  },
  "devDependencies": {
--- a/src/main.ts
+++ b/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,7 +33,7 @@ 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;
@ -56,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);
  }
--- a/yarn.lock
+++ b/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"
Author	SHA1	Message	Date
CrazyMax	07b1484797	Merge pull request #40 from crazy-max/master Simplify README	2020-11-18 18:31:41 +01:00
CrazyMax	2ec180e24a	Simplify README Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>	2020-11-18 18:30:28 +01:00
CrazyMax	8c8d171420	Merge pull request #39 from crazy-max/master Update README and screenshot	2020-11-18 18:28:13 +01:00
CrazyMax	7b1571268a	Update README and screenshot Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>	2020-11-18 18:25:03 +01:00
CrazyMax	f9814f80df	Merge pull request #36 from docker/dependabot/npm_and_yarn/actions/tool-cache-1.6.1 Bump @actions/tool-cache from 1.6.0 to 1.6.1	2020-11-18 18:19:55 +01:00
CrazyMax	6635284beb	Merge pull request #38 from crazy-max/master Use major version of actions	2020-11-18 18:16:17 +01:00
CrazyMax	3e60c35816	Use major version of actions Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>	2020-11-18 18:13:18 +01:00
dependabot[bot]	f5f60fa737	Bump @actions/tool-cache from 1.6.0 to 1.6.1 Bumps [@actions/tool-cache](https://github.com/actions/toolkit/tree/HEAD/packages/tool-cache) from 1.6.0 to 1.6.1. - [Release notes](https://github.com/actions/toolkit/releases) - [Changelog](https://github.com/actions/toolkit/blob/main/packages/tool-cache/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/tool-cache) Signed-off-by: dependabot[bot] <support@github.com>	2020-11-16 07:03:12 +00:00
CrazyMax	43c79af50b	Merge pull request #34 from docker/dependabot/github_actions/actions/checkout-v2.3.4 Bump actions/checkout from v2.3.3 to v2.3.4	2020-11-12 20:11:01 +01:00
dependabot[bot]	0c969bab1f	Bump actions/checkout from v2.3.3 to v2.3.4 Bumps [actions/checkout](https://github.com/actions/checkout) from v2.3.3 to v2.3.4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.3...5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f) Signed-off-by: dependabot[bot] <support@github.com>	2020-11-04 06:07:09 +00:00
CrazyMax	dc5191ec77	Merge pull request #32 from crazy-max/group-log-output Group log output	2020-10-20 22:34:31 +02:00
CrazyMax	f9ddc94e27	Group log output Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>	2020-10-20 22:30:00 +02:00
CrazyMax	55b445ecbc	Merge pull request #31 from docker/dependabot/github_actions/codecov/codecov-action-v1.0.14 Bump codecov/codecov-action from v1.0.13 to v1.0.14	2020-10-20 00:54:09 +02:00
dependabot[bot]	19625e207e	Bump codecov/codecov-action from v1.0.13 to v1.0.14 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from v1.0.13 to v1.0.14. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Commits](https://github.com/codecov/codecov-action/compare/v1.0.13...7d5dfa54903bd909319c580a00535b483d1efcf3) Signed-off-by: dependabot[bot] <support@github.com>	2020-10-19 04:17:50 +00:00
CrazyMax	ba442a71c2	Merge pull request #30 from docker/dependabot/npm_and_yarn/actions/http-client-1.0.9 Bump @actions/http-client from 1.0.8 to 1.0.9	2020-10-13 20:38:25 +02:00
CrazyMax	bd58e36ac7	Bump @actions/http-client from 1.0.8 to 1.0.9 Bumps [@actions/http-client](https://github.com/actions/http-client) from 1.0.8 to 1.0.9. - [Release notes](https://github.com/actions/http-client/releases) - [Changelog](https://github.com/actions/http-client/blob/main/RELEASES.md) - [Commits](https://github.com/actions/http-client/commits) Signed-off-by: dependabot[bot] <support@github.com>	2020-10-13 20:34:51 +02:00