Merge pull request #27 from crazy-max/hotfix

Temporarly set buildkit container image to moby/buildkit:v0.8-beta

.github/workflows/labels.yml

@@ -17,4 +17,4 @@ jobs:
         uses: actions/checkout@v2.3.3
       -
         name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@v3.0.0
+        uses: crazy-max/ghaction-github-labeler@v3.1.0

dist/index.js

@@ -525,12 +525,22 @@ function run() {
             if (inputs.driver !== 'docker') {
                 core.info('🔨 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');
                 }
@@ -1302,6 +1312,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __webpack_require__(351);
+const file_command_1 = __webpack_require__(717);
+const utils_1 = __webpack_require__(278);
 const os = __importStar(__webpack_require__(87));
 const path = __importStar(__webpack_require__(622));
 /**
@@ -1328,10 +1340,18 @@ var ExitCode;
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function exportVariable(name, val) {
-    const convertedVal = command_1.toCommandValue(val);
+    const convertedVal = utils_1.toCommandValue(val);
     process.env[name] = convertedVal;
+    const filePath = process.env['GITHUB_ENV'] || '';
+    if (filePath) {
+        const delimiter = '_GitHubActionsFileCommandDelimeter_';
+        const commandValue = `${name}<<${delimiter}${os.EOL}${convertedVal}${os.EOL}${delimiter}`;
+        file_command_1.issueCommand('ENV', commandValue);
+    }
+    else {
         command_1.issueCommand('set-env', { name }, convertedVal);
     }
+}
 exports.exportVariable = exportVariable;
 /**
  * Registers a secret which will get masked from logs
@@ -1346,7 +1366,13 @@ exports.setSecret = setSecret;
  * @param inputPath
  */
 function addPath(inputPath) {
+    const filePath = process.env['GITHUB_PATH'] || '';
+    if (filePath) {
+        file_command_1.issueCommand('PATH', inputPath);
+    }
+    else {
         command_1.issueCommand('add-path', {}, inputPath);
+    }
     process.env['PATH'] = `${inputPath}${path.delimiter}${process.env['PATH']}`;
 }
 exports.addPath = addPath;
@@ -1795,6 +1821,32 @@ if (process.env.NODE_DEBUG && /\btunnel\b/.test(process.env.NODE_DEBUG)) {
 exports.debug = debug; // for test
 
 
+/***/ }),
+
+/***/ 278:
+/***/ (function(__unusedmodule, exports) {
+
+"use strict";
+
+// We use any as a valid input type
+/* eslint-disable @typescript-eslint/no-explicit-any */
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Sanitizes an input into a string so it can be passed into issueCommand safely
+ * @param input input to sanitize into a string
+ */
+function toCommandValue(input) {
+    if (input === null || input === undefined) {
+        return '';
+    }
+    else if (typeof input === 'string' || input instanceof String) {
+        return input;
+    }
+    return JSON.stringify(input);
+}
+exports.toCommandValue = toCommandValue;
+//# sourceMappingURL=utils.js.map
+
 /***/ }),
 
 /***/ 279:
@@ -2154,6 +2206,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = __importStar(__webpack_require__(87));
+const utils_1 = __webpack_require__(278);
 /**
  * Commands
  *
@@ -2207,28 +2260,14 @@ class Command {
         return cmdStr;
     }
 }
-/**
- * Sanitizes an input into a string so it can be passed into issueCommand safely
- * @param input input to sanitize into a string
- */
-function toCommandValue(input) {
-    if (input === null || input === undefined) {
-        return '';
-    }
-    else if (typeof input === 'string' || input instanceof String) {
-        return input;
-    }
-    return JSON.stringify(input);
-}
-exports.toCommandValue = toCommandValue;
 function escapeData(s) {
-    return toCommandValue(s)
+    return utils_1.toCommandValue(s)
         .replace(/%/g, '%25')
         .replace(/\r/g, '%0D')
         .replace(/\n/g, '%0A');
 }
 function escapeProperty(s) {
-    return toCommandValue(s)
+    return utils_1.toCommandValue(s)
         .replace(/%/g, '%25')
         .replace(/\r/g, '%0D')
         .replace(/\n/g, '%0A')
@@ -5269,6 +5308,42 @@ function bytesToUuid(buf, offset) {
 module.exports = bytesToUuid;
 
 
+/***/ }),
+
+/***/ 717:
+/***/ (function(__unusedmodule, exports, __webpack_require__) {
+
+"use strict";
+
+// For internal use, subject to change.
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// We use any as a valid input type
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const fs = __importStar(__webpack_require__(747));
+const os = __importStar(__webpack_require__(87));
+const utils_1 = __webpack_require__(278);
+function issueCommand(command, message) {
+    const filePath = process.env[`GITHUB_${command}`];
+    if (!filePath) {
+        throw new Error(`Unable to find environment variable for file command ${command}`);
+    }
+    if (!fs.existsSync(filePath)) {
+        throw new Error(`Missing file at path: ${filePath}`);
+    }
+    fs.appendFileSync(filePath, `${utils_1.toCommandValue(message)}${os.EOL}`, {
+        encoding: 'utf8'
+    });
+}
+exports.issueCommand = issueCommand;
+//# sourceMappingURL=file-command.js.map
+
 /***/ }),
 
 /***/ 741:

src/main.ts

@@ -33,12 +33,22 @@ async function run(): Promise<void> {
     if (inputs.driver !== 'docker') {
       core.info('🔨 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');
       }