containerify 2.4.0 → 2.5.0

package/lib/cli.js

@@ -18,6 +18,7 @@ const fse = require("fs-extra");
 const fs = require("fs");
 const registry_1 = require("./registry");
 const appLayerCreator_1 = require("./appLayerCreator");
+const dockerExporter_1 = require("./dockerExporter");
 const tarExporter_1 = require("./tarExporter");
 const logger_1 = require("./logger");
 const utils_1 = require("./utils");
@@ -33,6 +34,7 @@ const possibleArgs = {
     "--toRegistry <registry url>": "Optional: URL of registry to push base image to - Default: https://registry-1.docker.io/v2/",
     "--toToken <token>": "Optional: Authentication token for target registry",
     "--toTar <path>": "Optional: Export to tar file",
+    "--toDocker": "Optional: Export to local docker registry",
     "--registry <path>": "Optional: Convenience argument for setting both from and to registry",
     "--platform <platform>": "Optional: Preferred platform, e.g. linux/amd64 or arm64",
     "--token <path>": "Optional: Convenience argument for setting token for both from and to registry",
@@ -168,8 +170,8 @@ if (options.token) {
 exitWithErrorIf(!options.folder, "--folder must be specified");
 exitWithErrorIf(!options.fromImage, "--fromImage must be specified");
 exitWithErrorIf(!options.toImage, "--toImage must be specified");
-exitWithErrorIf(!options.toRegistry && !options.toTar, "Must specify either --toTar or --toRegistry");
-exitWithErrorIf(!options.toRegistry && !options.toToken && !options.toTar, "A token must be given when uploading to docker hub");
+exitWithErrorIf(!options.toRegistry && !options.toTar && !options.toDocker, "Must specify either --toTar, --toRegistry or --toDocker");
+exitWithErrorIf(!!options.toRegistry && !options.toToken, "A token must be given when uploading to docker hub");
 if (options.toRegistry && !options.toRegistry.endsWith("/"))
     options.toRegistry += "/";
 if (options.fromRegistry && !options.fromRegistry.endsWith("/"))
@@ -211,6 +213,14 @@ function run(options) {
             : (0, registry_1.createDockerRegistry)(options.fromToken);
         yield fromRegistry.download(options.fromImage, fromdir, (0, utils_1.getPreferredPlatform)(options.platform), options.layerCacheFolder);
         yield appLayerCreator_1.default.addLayers(tmpdir, fromdir, todir, options);
+        if (options.toDocker) {
+            if (!(yield dockerExporter_1.default.isAvailable())) {
+                throw new Error("Docker executable not found on path. Unable to export to local docker registry.");
+            }
+            const dockerDir = path.join(tmpdir, "toDocker");
+            yield tarExporter_1.default.saveToTar(todir, tmpdir, dockerDir, [options.toImage], options);
+            yield dockerExporter_1.default.load(dockerDir);
+        }
         if (options.toTar) {
             yield tarExporter_1.default.saveToTar(todir, tmpdir, options.toTar, [options.toImage], options);
         }

package/lib/dockerExporter.d.ts

@@ -0,0 +1,7 @@
+declare function isAvailable(): Promise<boolean>;
+declare function load(path: string): Promise<void>;
+declare const _default: {
+    isAvailable: typeof isAvailable;
+    load: typeof load;
+};
+export default _default;

package/lib/dockerExporter.js

@@ -0,0 +1,36 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_util_1 = require("node:util");
+const node_child_process_1 = require("node:child_process");
+const logger_1 = require("./logger");
+const execAsync = (0, node_util_1.promisify)(node_child_process_1.exec);
+function isAvailable() {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            yield execAsync("docker -v");
+        }
+        catch (e) {
+            return false;
+        }
+        return true;
+    });
+}
+function load(path) {
+    return __awaiter(this, void 0, void 0, function* () {
+        logger_1.default.info("Loading docker image from tarball...");
+        yield execAsync(`docker load -i ${path}`);
+    });
+}
+exports.default = {
+    isAvailable,
+    load,
+};

package/lib/types.d.ts

@@ -63,6 +63,7 @@ export type Options = {
     toRegistry?: string;
     toToken?: string;
     toTar?: string;
+    toDocker?: boolean;
     registry?: string;
     platform: string;
     token?: string;

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.4.0";
+export declare const VERSION = "2.5.0";

package/lib/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = "2.4.0";
+exports.VERSION = "2.5.0";

package/package.json

@@ -1,10 +1,9 @@
 {
 	"name": "containerify",
-	"version": "2.4.0",
+	"version": "2.5.0",
 	"description": "Build node.js docker images without docker",
 	"main": "./lib/cli.js",
 	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1",
 		"prebuild": "node -p \"'export const VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
 		"build": "tsc && chmod ugo+x lib/cli.js",
 		"lint": "eslint . --ext .ts --fix --ignore-path .gitignore",