containerify 3.2.1 → 3.3.1

package/lib/appLayerCreator.d.ts

@@ -1,5 +1,5 @@
-import { Options } from "./types";
-declare function addLayers(tmpdir: string, fromdir: string, todir: string, options: Options): Promise<void>;
+import { ManifestDescriptor, Options } from "./types";
+declare function addLayers(tmpdir: string, fromdir: string, todir: string, options: Options): Promise<ManifestDescriptor>;
 declare const _default: {
     addLayers: typeof addLayers;
 };

package/lib/appLayerCreator.js

@@ -253,7 +253,14 @@ function addLayers(tmpdir, fromdir, todir, options) {
         yield fs_1.promises.writeFile(configFile, configContent);
         manifest.config.digest = "sha256:" + configHash;
         manifest.config.size = yield fileutil.sizeOf(configFile);
-        yield fs_1.promises.writeFile(path.join(todir, "manifest.json"), JSON.stringify(manifest));
+        const manifestJson = JSON.stringify(manifest);
+        yield fs_1.promises.writeFile(path.join(todir, "manifest.json"), manifestJson);
+        const manifestBuffer = Buffer.from(manifestJson, "utf-8");
+        return {
+            mediaType: manifest.mediaType,
+            digest: calculateHashOfBuffer(manifestBuffer),
+            size: manifestBuffer.byteLength,
+        };
     });
 }
 exports.default = {

package/lib/cli.js

@@ -61,6 +61,7 @@ program
     .option("--layerOwner <gid:uid>", "Optional: Set specific gid and uid on files in the added layers")
     .option("--buildFolder <path>", "Optional: Use a specific build folder when creating the image")
     .option("--layerCacheFolder <path>", "Optional: Folder to cache base layers between builds")
+    .option("--writeDigestTo <path>", "Optional: Write the resulting image digest to the file path provided")
     .version(version_1.VERSION, "--version", "Get containerify version");
 program.parse(process.argv);
 function setKeyValue(target, keyValue, separator = "=", defaultValue) {
@@ -96,7 +97,6 @@ const labels = Object.assign(Object.assign({}, configFromFile.labels), labelsOpt
 const envOpt = {};
 (_b = cliOptions.envs) === null || _b === void 0 ? void 0 : _b.forEach((envs) => envs.split(",").forEach((env) => setKeyValue(envOpt, env)));
 const envs = Object.assign(Object.assign({}, configFromFile.envs), envOpt); //Let cli arguments override file
-console.log(envs);
 const customContent = {};
 (_c = configFromFile.customContent) === null || _c === void 0 ? void 0 : _c.forEach((c) => setKeyValue(customContent, c, ":", c));
 (_d = cliOptions.customContent) === null || _d === void 0 ? void 0 : _d.forEach((contents) => contents.split(",").forEach((content) => setKeyValue(customContent, content, ":", content)));
@@ -118,7 +118,7 @@ const options = Object.assign(Object.assign(Object.assign({}, defaultOptions), s
         user: setOptions.user,
         workdir: setOptions.workdir,
         entrypoint: setOptions.entrypoint,
-    } });
+    }, writeDigestTo: cliOptions.writeDigestTo });
 function exitWithErrorIf(check, error) {
     if (check) {
         logger_1.default.error("ERROR: " + error);
@@ -214,7 +214,7 @@ function run(options) {
         const fromRegistryUrl = (_a = options.fromRegistry) !== null && _a !== void 0 ? _a : registry_1.DEFAULT_DOCKER_REGISTRY;
         const fromRegistry = yield (0, registry_1.createRegistry)(fromRegistryUrl, options.fromImage, allowInsecure, options.fromToken);
         const originalManifest = yield fromRegistry.download(options.fromImage, fromdir, (0, utils_1.getPreferredPlatform)(options.platform), options.layerCacheFolder);
-        yield appLayerCreator_1.default.addLayers(tmpdir, fromdir, todir, options);
+        const manifestDescriptor = 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.");
@@ -233,6 +233,10 @@ function run(options) {
         logger_1.default.debug(`Deleting ${tmpdir} ...`);
         yield fse.remove(tmpdir);
         logger_1.default.debug("Done");
+        if (options.writeDigestTo) {
+            logger_1.default.debug(`Writing digest ${manifestDescriptor.digest} to ${options.writeDigestTo}`);
+            fs.writeFileSync(options.writeDigestTo, manifestDescriptor.digest);
+        }
     });
 }
 logger_1.default.debug("Running with config:", options);

package/lib/httpRequest.js

@@ -101,7 +101,6 @@ function followRedirects(uri, headers, allowInsecure, cb, count = 0) {
             if (count > 10)
                 return cb({ error: "Too many redirects for " + uri });
             const location = res.headers.location;
-            console.log(res.headers);
             if (!location)
                 return cb({ error: "Redirect, but missing location header" });
             return followRedirects(location, headers, allowInsecure, cb, count + 1);

package/lib/types.d.ts

@@ -91,6 +91,7 @@ export type Options = {
         workdir?: string;
         entrypoint?: string;
     };
+    writeDigestTo?: string;
 };
 export declare enum InsecureRegistrySupport {
     NO = 0,
@@ -101,4 +102,5 @@ export type Registry = {
     upload: (imageStr: string, folder: string, doCrossMount: boolean, originalManifest: Manifest, originalRepository: string) => Promise<void>;
     registryBaseUrl: string;
 };
+export type ManifestDescriptor = Descriptor;
 export {};

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.2.1";
+export declare const VERSION = "3.3.1";

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "containerify",
-	"version": "3.2.1",
+	"version": "3.3.1",
 	"description": "Build node.js docker images without docker",
 	"main": "./lib/cli.js",
 	"scripts": {