containerify 3.1.2 → 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)",

package/lib/registry.js

@@ -140,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;
     });

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/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.1.2";
+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.2";
+exports.VERSION = "3.2.0";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "containerify",
-	"version": "3.1.2",
+	"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/"