containerify 3.3.1 → 3.3.2

package/lib/appLayerCreator.js

@@ -22,39 +22,25 @@ const utils_1 = require("./utils");
 const version_1 = require("./version");
 const depLayerPossibles = ["package.json", "package-lock.json", "node_modules"];
 const ignore = [".git", ".gitignore", ".npmrc", ".DS_Store", "npm-debug.log", ".svn", ".hg", "CVS"];
-function statCache(layerOwner) {
+function createOnWriteEntry(layerOwner) {
     if (!layerOwner)
-        return null;
-    // We use the stat cache to overwrite uid and gid in image.
-    // A bit hacky
-    const statCacheMap = new Map();
-    const a = layerOwner.split(":");
-    const gid = parseInt(a[0]);
-    const uid = parseInt(a[1]);
-    return {
-        get: function (name) {
-            if (statCacheMap.has(name))
-                return statCacheMap.get(name);
-            const stat = fss.statSync(name);
-            stat.uid = uid;
-            stat.gid = gid;
-            stat.atime = new Date(0);
-            stat.mtime = new Date(0);
-            stat.ctime = new Date(0);
-            stat.birthtime = new Date(0);
-            stat.atimeMs = 0;
-            stat.mtimeMs = 0;
-            stat.ctimeMs = 0;
-            stat.birthtimeMs = 0;
-            statCacheMap.set(name, stat);
-            return stat;
-        },
-        set: function (name, stat) {
-            statCacheMap.set(name, stat);
-        },
-        has: function () {
-            return true;
-        },
+        return undefined;
+    // We use onWriteEntry to overwrite uid and gid in the tar archive
+    // Format is already validated in cli.ts to be "gid:uid"
+    const parts = layerOwner.split(":");
+    const gid = parseInt(parts[0], 10);
+    const uid = parseInt(parts[1], 10);
+    return (entry) => {
+        if (entry.header) {
+            entry.header.uid = uid;
+            entry.header.gid = gid;
+            entry.header.uname = "";
+            entry.header.gname = "";
+            // Set all timestamps to epoch to match original behavior
+            entry.header.atime = new Date(0);
+            entry.header.mtime = new Date(0);
+            entry.header.ctime = new Date(0);
+        }
     };
 }
 const tarDefaultConfig = {
@@ -127,7 +113,7 @@ function addDataLayer(tmpdir, todir, options, config, manifest, files, comment)
                 comment +
                 (comment == "dependencies" ? ". Did you forget to run npm install?" : ""));
         }
-        yield tar.create(Object.assign(Object.assign({}, tarDefaultConfig), Object.assign({ statCache: statCache(options.layerOwner), portable: !options.layerOwner, prefix: "/", cwd: buildDir, file: layerFile, gzip: true, noMtime: !(options.setTimeStamp || options.preserveTimeStamp) }, (options.setTimeStamp ? { mtime: new Date(options.setTimeStamp) } : {}))), filesToTar);
+        yield tar.create(Object.assign(Object.assign({}, tarDefaultConfig), Object.assign({ onWriteEntry: createOnWriteEntry(options.layerOwner), portable: !options.layerOwner, prefix: "/", cwd: buildDir, file: layerFile, gzip: true, noMtime: !(options.setTimeStamp || options.preserveTimeStamp) }, (options.setTimeStamp ? { mtime: new Date(options.setTimeStamp) } : {}))), filesToTar);
         const fhash = yield calculateHash(layerFile);
         const finalName = path.join(todir, fhash + ".tar.gz");
         yield fse.move(layerFile, finalName);

package/lib/httpRequest.js

@@ -20,7 +20,6 @@ exports.dlJson = dlJson;
 exports.followRedirects = followRedirects;
 const https = require("https");
 const http = require("http");
-const URL = require("url");
 const logger_1 = require("./logger");
 const types_1 = require("./types");
 exports.redirectCodes = [308, 307, 303, 302, 301];
@@ -28,9 +27,15 @@ function isOk(httpStatus) {
     return httpStatus >= 200 && httpStatus < 300;
 }
 function createHttpOptions(method, url, headers) {
-    const options = Object.assign({}, URL.parse(url));
-    options.headers = headers;
-    options.method = method;
+    const parsedUrl = new URL(url);
+    const options = {
+        protocol: parsedUrl.protocol,
+        hostname: parsedUrl.hostname,
+        port: parsedUrl.port,
+        path: parsedUrl.pathname + parsedUrl.search,
+        headers: headers,
+        method: method,
+    };
     if (url.includes("X-Amz-Algorithm") && method == "GET") {
         //We are using a pre-signed URL, so we don't need to send the Authorization header
         options.headers["Authorization"] = "";

package/lib/registry.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_DOCKER_REGISTRY = void 0;
 exports.createRegistry = createRegistry;
 exports.parseFullImageUrl = parseFullImageUrl;
-const URL = require("url");
 const fss = require("fs");
 const fs_1 = require("fs");
 const path = require("path");
@@ -130,7 +129,7 @@ function uploadContent(uploadUrl, file, fileConfig, allowInsecure, auth, content
 }
 function processToken(registryBaseUrl, allowInsecure, imagePath, token) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { hostname } = new URL.URL(registryBaseUrl);
+        const { hostname } = new URL(registryBaseUrl);
         const image = (0, utils_1.parseImage)(imagePath);
         if ((hostname === null || hostname === void 0 ? void 0 : hostname.endsWith(".docker.io")) && !token)
             return getDockerToken(image.path, allowInsecure);
@@ -182,8 +181,14 @@ function createRegistry(registryBaseUrl_1, imagePath_1, allowInsecure_1, auth_1)
                 return new Promise((resolve, reject) => {
                     const parameters = new URLSearchParams(mountParameters);
                     const url = `${registryBaseUrl}${image.path}/blobs/uploads/${parameters.size > 0 ? "?" + parameters : ""}`;
-                    const options = URL.parse(url);
-                    options.method = "POST";
+                    const parsedUrl = new URL(url);
+                    const options = {
+                        protocol: parsedUrl.protocol,
+                        hostname: parsedUrl.hostname,
+                        port: parsedUrl.port,
+                        path: parsedUrl.pathname + parsedUrl.search,
+                        method: "POST",
+                    };
                     if (token)
                         options.headers = { authorization: token };
                     (0, httpRequest_1.request)(options, allowInsecure, (res) => {
@@ -195,7 +200,7 @@ function createRegistry(registryBaseUrl_1, imagePath_1, allowInsecure_1, auth_1)
                                     resolve({ uploadUrl: location });
                                 }
                                 else {
-                                    const regURL = URL.parse(registryBaseUrl);
+                                    const regURL = new URL(registryBaseUrl);
                                     resolve({
                                         uploadUrl: `${regURL.protocol}//${regURL.hostname}${regURL.port ? ":" + regURL.port : ""}${location}`,
                                     });

package/lib/version.d.ts

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

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "containerify",
-	"version": "3.3.1",
+	"version": "3.3.2",
 	"description": "Build node.js docker images without docker",
 	"main": "./lib/cli.js",
 	"scripts": {
@@ -37,8 +37,8 @@
 	],
 	"dependencies": {
 		"commander": "^13.1.0",
-		"fs-extra": "^11.3.0",
-		"tar": "^6.2.1"
+		"fs-extra": "^11.3.2",
+		"tar": "^7.5.7"
 	},
 	"devDependencies": {
 		"@eslint/eslintrc": "^3.3.1",