containerify 3.1.1 → 3.2.0

package/lib/appLayerCreator.js

@@ -75,8 +75,8 @@ function calculateHash(path) {
         stream.on("end", () => resolve(hash.digest("hex")));
     });
 }
-function copySync(src, dest) {
-    const copyOptions = { overwrite: true, dereference: true };
+function copySync(src, dest, preserveTimestamps) {
+    const copyOptions = { overwrite: true, dereference: true, preserveTimestamps: preserveTimestamps };
     const destFolder = dest.substring(0, dest.lastIndexOf("/"));
     logger_1.default.debug("Copying " + src + " to " + dest);
     fse.ensureDirSync(destFolder);
@@ -112,10 +112,10 @@ function addDataLayer(tmpdir, todir, options, config, manifest, files, comment)
         const buildDir = yield fileutil.ensureEmptyDir(path.join(tmpdir, "build"));
         files.map((f) => {
             if (Array.isArray(f)) {
-                copySync(path.join(options.folder, f[0]), path.join(buildDir, f[1]));
+                copySync(path.join(options.folder, f[0]), path.join(buildDir, f[1]), !!options.preserveTimeStamp);
             }
             else {
-                copySync(path.join(options.folder, f), path.join(buildDir, options.workdir, f));
+                copySync(path.join(options.folder, f), path.join(buildDir, options.workdir, f), !!options.preserveTimeStamp);
             }
         });
         const layerFile = path.join(todir, "layer.tar.gz");
@@ -127,7 +127,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.setTimeStamp ? { mtime: new Date(options.setTimeStamp) } : {}))), filesToTar);
+        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);
         const fhash = yield calculateHash(layerFile);
         const finalName = path.join(todir, fhash + ".tar.gz");
         yield fse.move(layerFile, finalName);

package/lib/cli.js

@@ -50,6 +50,7 @@ const possibleArgs = {
     "--label <label>": "Optional: Single label (name=value). This option can be used multiple times.",
     "--envs <envs>": "Optional: Comma-separated list of key value pairs to use av environment variables.",
     "--env <env>": "Optional: Single environment variable (name=value). This option can be used multiple times.",
+    "--preserveTimeStamp": "Optional: Preserve timestamps on files in the added layers. This might help with cache invalidation.",
     "--setTimeStamp <timestamp>": "Optional: Set a specific ISO 8601 timestamp on all entries (e.g. git commit hash). Default: 1970 in tar files, and current time on manifest/config",
     "--verbose": "Verbose logging",
     "--allowInsecureRegistries": "Allow insecure registries (with self-signed/untrusted cert)",
@@ -226,8 +227,8 @@ Object.keys(options.extraContent).forEach((k) => {
     exitWithErrorIf(!fs.existsSync(options.folder + k), "Could not find `" + k + "` in the folder " + options.folder);
 });
 function run(options) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (!(yield fse.pathExists(options.folder)))
             throw new Error("No such folder: " + options.folder);
         const tmpdir = fs.mkdtempSync(path.join(os.tmpdir(), "containerify-"));

package/lib/fileutil.js

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureEmptyDir = exports.sizeOf = void 0;
+exports.sizeOf = sizeOf;
+exports.ensureEmptyDir = ensureEmptyDir;
 const fs_1 = require("fs");
 const fse = require("fs-extra");
 const fss = require("fs");
@@ -18,7 +19,6 @@ function sizeOf(file) {
         return (yield fs_1.promises.lstat(file)).size;
     });
 }
-exports.sizeOf = sizeOf;
 function ensureEmptyDir(path) {
     return __awaiter(this, void 0, void 0, function* () {
         if (fss.existsSync(path))
@@ -27,7 +27,6 @@ function ensureEmptyDir(path) {
         return path;
     });
 }
-exports.ensureEmptyDir = ensureEmptyDir;
 exports.default = {
     sizeOf,
     ensureEmptyDir,

package/lib/httpRequest.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import * as https from "https";
 import * as http from "http";
 import { InsecureRegistrySupport } from "./types";

package/lib/httpRequest.js

@@ -9,7 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.followRedirects = exports.dlJson = exports.waitForResponseEnd = exports.toError = exports.request = exports.buildHeaders = exports.createHttpOptions = exports.isOk = exports.redirectCodes = void 0;
+exports.redirectCodes = void 0;
+exports.isOk = isOk;
+exports.createHttpOptions = createHttpOptions;
+exports.buildHeaders = buildHeaders;
+exports.request = request;
+exports.toError = toError;
+exports.waitForResponseEnd = waitForResponseEnd;
+exports.dlJson = dlJson;
+exports.followRedirects = followRedirects;
 const https = require("https");
 const http = require("http");
 const URL = require("url");
@@ -19,21 +27,22 @@ exports.redirectCodes = [308, 307, 303, 302, 301];
 function isOk(httpStatus) {
     return httpStatus >= 200 && httpStatus < 300;
 }
-exports.isOk = isOk;
 function createHttpOptions(method, url, headers) {
     const options = Object.assign({}, URL.parse(url));
     options.headers = headers;
     options.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"] = "";
+    }
     return options;
 }
-exports.createHttpOptions = createHttpOptions;
 function buildHeaders(accept, auth) {
     const headers = { accept: accept };
     if (auth)
         headers.authorization = auth;
     return headers;
 }
-exports.buildHeaders = buildHeaders;
 function request(options, allowInsecure, callback) {
     if (allowInsecure == types_1.InsecureRegistrySupport.YES)
         options.rejectUnauthorized = false;
@@ -46,17 +55,14 @@ function request(options, allowInsecure, callback) {
     });
     return req;
 }
-exports.request = request;
 function toError(res) {
     return `Unexpected HTTP status ${res.statusCode} : ${res.statusMessage}`;
 }
-exports.toError = toError;
 function waitForResponseEnd(res, cb) {
     const data = [];
     res.on("data", (d) => data.push(d));
     res.on("end", () => cb(Buffer.concat(data)));
 }
-exports.waitForResponseEnd = waitForResponseEnd;
 function dl(uri, headers, allowInsecure) {
     logger_1.default.debug("dl", uri);
     return new Promise((resolve, reject) => {
@@ -66,9 +72,17 @@ function dl(uri, headers, allowInsecure) {
                 return reject(result.error);
             const { res } = result;
             logger_1.default.debug(res.statusCode, res.statusMessage, res.headers["content-type"], res.headers["content-length"]);
-            if (!isOk((_a = res.statusCode) !== null && _a !== void 0 ? _a : 0))
-                return reject(toError(res));
-            waitForResponseEnd(res, (data) => resolve(data.toString()));
+            if (!isOk((_a = res.statusCode) !== null && _a !== void 0 ? _a : 0)) {
+                const d = [];
+                res.on("data", (dt) => d.push(dt));
+                res.on("end", () => {
+                    logger_1.default.error("ERROR", Buffer.concat(d).toString());
+                    reject(toError(res));
+                });
+            }
+            else {
+                waitForResponseEnd(res, (data) => resolve(data.toString()));
+            }
         });
     });
 }
@@ -78,7 +92,6 @@ function dlJson(uri, headers, allowInsecure) {
         return JSON.parse(Buffer.from(data).toString("utf-8"));
     });
 }
-exports.dlJson = dlJson;
 function followRedirects(uri, headers, allowInsecure, cb, count = 0) {
     logger_1.default.debug("rc", uri);
     const options = createHttpOptions("GET", uri, headers);
@@ -88,6 +101,7 @@ 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);
@@ -95,4 +109,3 @@ function followRedirects(uri, headers, allowInsecure, cb, count = 0) {
         cb({ res });
     }).end();
 }
-exports.followRedirects = followRedirects;

package/lib/registry.js

@@ -9,7 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseFullImageUrl = exports.DEFAULT_DOCKER_REGISTRY = exports.createRegistry = void 0;
+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");
@@ -138,7 +140,8 @@ function processToken(registryBaseUrl, allowInsecure, imagePath, token) {
             return getGitLabToken(token, image.path, allowInsecure);
         if (token.startsWith("Basic "))
             return token;
-        if (token.startsWith("ghp_"))
+        const githubPrefixes = ["ghp_", "github_pat_", "gho_", "ghu_", "ghs_"];
+        if (githubPrefixes.some((prefix) => token.startsWith(prefix)))
             return "Bearer " + Buffer.from(token).toString("base64");
         return "Bearer " + token;
     });
@@ -152,14 +155,14 @@ function getDockerToken(imagePath, allowInsecure) {
 function getGitLabToken(token, imagePath, allowInsecure) {
     return __awaiter(this, void 0, void 0, function* () {
         if (token.includes(":")) {
-            token = "Basic " + Buffer.from(token === null || token === void 0 ? void 0 : token.replace("Basic ", "")).toString("base64");
+            token = "Basic " + Buffer.from(token.replace("Basic ", "")).toString("base64");
         }
         const resp = yield (0, httpRequest_1.dlJson)(`https://gitlab.com/jwt/auth?service=container_registry&scope=repository:${imagePath}:pull,push`, { Authorization: token }, allowInsecure);
         return `Bearer ${resp.token}`;
     });
 }
-function createRegistry(registryBaseUrl, imagePath, allowInsecure, auth, optimisticToRegistryCheck = false) {
-    return __awaiter(this, void 0, void 0, function* () {
+function createRegistry(registryBaseUrl_1, imagePath_1, allowInsecure_1, auth_1) {
+    return __awaiter(this, arguments, void 0, function* (registryBaseUrl, imagePath, allowInsecure, auth, optimisticToRegistryCheck = false) {
         const token = yield processToken(registryBaseUrl, allowInsecure, imagePath, auth);
         function exists(image, layer) {
             return __awaiter(this, void 0, void 0, function* () {
@@ -174,8 +177,8 @@ function createRegistry(registryBaseUrl, imagePath, allowInsecure, auth, optimis
                 yield uploadContent(uploadUrl, file, layer, allowInsecure, token);
             });
         }
-        function getUploadUrl(image, mountParameters = undefined) {
-            return __awaiter(this, void 0, void 0, function* () {
+        function getUploadUrl(image_1) {
+            return __awaiter(this, arguments, void 0, function* (image, mountParameters = undefined) {
                 return new Promise((resolve, reject) => {
                     const parameters = new URLSearchParams(mountParameters);
                     const url = `${registryBaseUrl}${image.path}/blobs/uploads/${parameters.size > 0 ? "?" + parameters : ""}`;
@@ -337,7 +340,6 @@ function createRegistry(registryBaseUrl, imagePath, allowInsecure, auth, optimis
         };
     });
 }
-exports.createRegistry = createRegistry;
 exports.DEFAULT_DOCKER_REGISTRY = "https://registry-1.docker.io/v2/";
 function parseFullImageUrl(imageStr) {
     const [registry, ...rest] = imageStr.split("/");
@@ -352,4 +354,3 @@ function parseFullImageUrl(imageStr) {
         image: rest.join("/"),
     };
 }
-exports.parseFullImageUrl = parseFullImageUrl;

package/lib/types.d.ts

@@ -76,6 +76,7 @@ export type Options = {
     entrypoint: string;
     labels: Record<string, string>;
     envs: string[];
+    preserveTimeStamp?: boolean;
     setTimeStamp?: string;
     verbose?: boolean;
     allowInsecureRegistries?: boolean;

package/lib/utils.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseImage = exports.getHash = exports.getLayerTypeFileEnding = exports.getManifestLayerType = exports.getPreferredPlatform = exports.omit = exports.unique = void 0;
+exports.unique = unique;
+exports.omit = omit;
+exports.getPreferredPlatform = getPreferredPlatform;
+exports.getManifestLayerType = getManifestLayerType;
+exports.getLayerTypeFileEnding = getLayerTypeFileEnding;
+exports.getHash = getHash;
+exports.parseImage = parseImage;
 const MIMETypes_1 = require("./MIMETypes");
 function unique(vals) {
     return [...new Set(vals)];
 }
-exports.unique = unique;
 function omit(obj, keys) {
     return Object.fromEntries(Object.entries(obj).filter(([k]) => !keys.includes(k)));
 }
-exports.omit = omit;
 function getPreferredPlatform(platform) {
     var _a, _b;
     // We assume the input is similar to docker which accepts `<os>/<arch>` and `<arch>`
@@ -68,7 +72,6 @@ function getPreferredPlatform(platform) {
         architecture: targetArch,
     };
 }
-exports.getPreferredPlatform = getPreferredPlatform;
 function getManifestLayerType(manifest) {
     if (manifest.mediaType === MIMETypes_1.OCI.manifest) {
         return MIMETypes_1.OCI.layer.gzip;
@@ -78,7 +81,6 @@ function getManifestLayerType(manifest) {
     }
     throw new Error(`${manifest.mediaType} not recognized.`);
 }
-exports.getManifestLayerType = getManifestLayerType;
 function getLayerTypeFileEnding(layer) {
     switch (layer.mediaType) {
         case MIMETypes_1.OCI.layer.gzip:
@@ -91,15 +93,12 @@ function getLayerTypeFileEnding(layer) {
             throw new Error(`Layer mediaType ${layer.mediaType} not known.`);
     }
 }
-exports.getLayerTypeFileEnding = getLayerTypeFileEnding;
 function getHash(digest) {
     return digest.split(":")[1];
 }
-exports.getHash = getHash;
 function parseImage(imageStr) {
     const ar = imageStr.split(":");
     const tag = ar[1] || "latest";
     const ipath = ar[0];
     return { path: ipath, tag: tag };
 }
-exports.parseImage = parseImage;

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.1.1";
+export declare const VERSION = "3.2.0";

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "containerify",
-	"version": "3.1.1",
+	"version": "3.2.0",
 	"description": "Build node.js docker images without docker",
 	"main": "./lib/cli.js",
 	"scripts": {
@@ -16,7 +16,7 @@
 		"allTests": "npm run integrationTest && npm run registryTest"
 	},
 	"bin": {
-		"containerify": "./lib/cli.js"
+		"containerify": "lib/cli.js"
 	},
 	"author": "Erlend Oftedal <erlend@oftedal.no>",
 	"contributors": [
@@ -25,7 +25,7 @@
 	"license": "Apache-2.0",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/eoftedal/containerify.git"
+		"url": "git+https://github.com/eoftedal/containerify.git"
 	},
 	"files": [
 		"lib/"