Merge pull request #43 from crazy-max/remove-tempfix

Remove hardcoded buildkit container image moby/buildkit:v0.8-beta
2025-06-26 12:41:09 +02:00 · 2020-12-06 14:29:23 -08:00 · 2020-12-06 11:11:17 +01:00 · 2020-12-05 08:03:44 +01:00 · 2020-12-05 07:17:58 +01:00 · 2020-12-02 06:10:04 +00:00
4 changed files with 908 additions and 54 deletions
--- a/dist/index.js
+++ b/dist/index.js
--- a/package.json
+++ b/package.json
@ -31,7 +31,7 @@
    "@actions/exec": "^1.0.4",
    "@actions/http-client": "^1.0.9",
    "@actions/tool-cache": "^1.6.1",
-    "semver": "^7.3.2"
+    "semver": "^7.3.4"
  },
  "devDependencies": {
    "@types/jest": "^26.0.3",
--- a/src/main.ts
+++ b/src/main.ts
@ -36,17 +36,9 @@ async function run(): Promise<void> {
      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 (!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);
        }
--- a/yarn.lock
+++ b/yarn.lock
@ -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"
@ -3753,6 +3762,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"
Author	SHA1	Message	Date
Tõnis Tiigi	5c0276ad2c	Merge pull request #43 from crazy-max/remove-tempfix Remove hardcoded buildkit container image moby/buildkit:v0.8-beta	2020-12-06 14:29:23 -08:00
CrazyMax	ca778fe8a3	Remove hardcoded buildkit container image moby/buildkit:v0.8-beta Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>	2020-12-06 11:11:17 +01:00
CrazyMax	c3c3e01512	Merge pull request #42 from docker/dependabot/npm_and_yarn/semver-7.3.4 Bump semver from 7.3.2 to 7.3.4	2020-12-05 08:03:44 +01:00
CrazyMax	a999bae018	Update generated content Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>	2020-12-05 07:17:58 +01:00
dependabot[bot]	4608f72b35	Bump semver from 7.3.2 to 7.3.4 Bumps [semver](https://github.com/npm/node-semver) from 7.3.2 to 7.3.4. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/master/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v7.3.2...v7.3.4) Signed-off-by: dependabot[bot] <support@github.com>	2020-12-02 06:10:04 +00:00