containerify 3.1.2 → 3.2.1

package/README.md

@@ -53,42 +53,41 @@ This will take the `nginx:alpine` image, and copy the files from `./dist/` into
 Usage: containerify [options]
 
 Options:
-  --from <registry/image:tag>    Optional: Shorthand to specify fromRegistry and fromImage in one argument
-  --to <registry/image:tag>      Optional: Shorthand to specify toRegistry and toImage in one argument
-  --fromImage <name:tag>         Required: Image name of base image - [path/]image:tag
-  --toImage <name:tag>           Required: Image name of target image - [path/]image:tag
-  --folder <full path>           Required: Base folder of node application (contains package.json)
-  --file <path>                  Optional: Name of configuration file (defaults to containerify.json if found on path)
-  --doCrossMount                 Optional: Cross mount image layers from the base image (only works if fromImage and toImage are in the same registry) (default: false)
-  --fromRegistry <registry url>  Optional: URL of registry to pull base image from - Default: https://registry-1.docker.io/v2/
-  --fromToken <token>            Optional: Authentication token for from registry
-  --toRegistry <registry url>    Optional: URL of registry to push base image to - Default: https://registry-1.docker.io/v2/
-  --optimisticToRegistryCheck    Treat redirects as layer existing in remote registry. Potentially unsafe, but can save bandwidth.
-  --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
-  --user <user>                  Optional: User account to run process in container - default: 1000 (empty for customContent)
-  --workdir <directory>          Optional: Workdir where node app will be added and run from - default: /app (empty for customContent)
-  --entrypoint <entrypoint>      Optional: Entrypoint when starting container - default: npm start (empty for customContent)
-  --labels <labels>              Optional: Comma-separated list of key value pairs to use as labels
-  --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.
-  --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)
-  --allowNoPushAuth              Allow pushing images without authentication/token if the registry allows it
-  --customContent <dirs/files>   Optional: Skip normal node_modules and applayer and include specified root folder files/directories instead. You can specify as
-                                 local-path:absolute-container-path if you want to place it in a specific location
-  --extraContent <dirs/files>    Optional: Add specific content. Specify as local-path:absolute-container-path,local-path2:absolute-container-path2 etc
-  --layerOwner <gid:uid>         Optional: Set specific gid and uid on files in the added layers
-  --buildFolder <path>           Optional: Use a specific build folder when creating the image
-  --layerCacheFolder <path>      Optional: Folder to cache base layers between builds
-  --version                      Get containerify version
-  -h, --help                     display help for command
+  --from <registry/image:tag>     Optional: Shorthand to specify fromRegistry and fromImage in one argument
+  --to <registry/image:tag>       Optional: Shorthand to specify toRegistry and toImage in one argument
+  --fromImage <name:tag>          Required: Image name of base image - [path/]image:tag
+  --toImage <name:tag>            Required: Image name of target image - [path/]image:tag
+  --folder <full path>            Required: Base folder of node application (contains package.json)
+  --file <path>                   Optional: Name of configuration file (defaults to containerify.json if found on path)
+  --doCrossMount                  Optional: Cross mount image layers from the base image (only works if fromImage and toImage are in the same registry) (default: false)
+  --fromRegistry <registry url>   Optional: URL of registry to pull base image from - Default: https://registry-1.docker.io/v2/
+  --fromToken <token>             Optional: Authentication token for from registry
+  --toRegistry <registry url>     Optional: URL of registry to push base image to - Default: https://registry-1.docker.io/v2/
+  --optimisticToRegistryCheck     Treat redirects as layer existing in remote registry. Potentially unsafe, but can save bandwidth.
+  --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
+  --user <user>                   Optional: User account to run process in container - default: 1000 (empty for customContent)
+  --workdir <directory>           Optional: Workdir where node app will be added and run from - default: /app (empty for customContent)
+  --entrypoint <entrypoint>       Optional: Entrypoint when starting container - default: npm start (empty for customContent)
+  --label, --labels <labels...>   Optional: Comma-separated list of key value pairs to use as labels
+  --env, --envs <envs...>         Optional: Comma-separated list of key value pairs to use av environment variables.
+  --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
+  --preserveTimeStamp             Optional: Preserve timestamps on files in the added layers. This might help with cache invalidation.
+  --verbose                       Verbose logging
+  --allowInsecureRegistries       Allow insecure registries (with self-signed/untrusted cert)
+  --allowNoPushAuth               Allow pushing images without authentication/token if the registry allows it
+  --customContent <dirs/files...> Optional: Skip normal node_modules and applayer and include specified root folder files/directories instead. You can specify as
+                                  local-path:absolute-container-path if you want to place it in a specific location
+  --extraContent <dirs/files...>  Optional: Add specific content. Specify as local-path:absolute-container-path,local-path2:absolute-container-path2 etc
+  --layerOwner <gid:uid>          Optional: Set specific gid and uid on files in the added layers
+  --buildFolder <path>            Optional: Use a specific build folder when creating the image
+  --layerCacheFolder <path>       Optional: Folder to cache base layers between builds
+  --version                       Get containerify version
+  -h, --help                      display help for command
 ```
 
 ## Detailed info

package/lib/appLayerCreator.js

@@ -75,10 +75,10 @@ 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);
+    logger_1.default.debug(`Copying ${src} to ${dest}`);
     fse.ensureDirSync(destFolder);
     fse.copySync(src, dest, copyOptions);
 }
@@ -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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+var _a, _b, _c, _d, _e, _f, _g, _h;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const commander_1 = require("commander");
@@ -25,67 +25,51 @@ const types_1 = require("./types");
 const utils_1 = require("./utils");
 const fileutil_1 = require("./fileutil");
 const version_1 = require("./version");
-const possibleArgs = {
-    "--from <registry/image:tag>": "Optional: Shorthand to specify fromRegistry and fromImage in one argument",
-    "--to <registry/image:tag>": "Optional: Shorthand to specify toRegistry and toImage in one argument",
-    "--fromImage <name:tag>": "Required: Image name of base image - [path/]image:tag",
-    "--toImage <name:tag>": "Required: Image name of target image - [path/]image:tag",
-    "--folder <full path>": "Required: Base folder of node application (contains package.json)",
-    "--file <path>": "Optional: Name of configuration file (defaults to containerify.json if found on path)",
-    "--doCrossMount": "Optional: Cross mount image layers from the base image (only works if fromImage and toImage are in the same registry) (default: false)",
-    "--fromRegistry <registry url>": "Optional: URL of registry to pull base image from - Default: https://registry-1.docker.io/v2/",
-    "--fromToken <token>": "Optional: Authentication token for from registry",
-    "--toRegistry <registry url>": "Optional: URL of registry to push base image to - Default: https://registry-1.docker.io/v2/",
-    "--optimisticToRegistryCheck": "Treat redirects as layer existing in remote registry. Potentially unsafe, but can save bandwidth.",
-    "--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",
-    "--user <user>": "Optional: User account to run process in container - default: 1000 (empty for customContent)",
-    "--workdir <directory>": "Optional: Workdir where node app will be added and run from - default: /app (empty for customContent)",
-    "--entrypoint <entrypoint>": "Optional: Entrypoint when starting container - default: npm start (empty for customContent)",
-    "--labels <labels>": "Optional: Comma-separated list of key value pairs to use as labels",
-    "--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.",
-    "--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)",
-    "--allowNoPushAuth": "Allow pushing images without a authentication/token to registries that allow it",
-    "--customContent <dirs/files>": "Optional: Skip normal node_modules and applayer and include specified root folder files/directories instead. You can specify as local-path:absolute-container-path if you want to place it in a specific location",
-    "--extraContent <dirs/files>": "Optional: Add specific content. Specify as local-path:absolute-container-path,local-path2:absolute-container-path2 etc",
-    "--layerOwner <gid:uid>": "Optional: Set specific gid and uid on files in the added layers",
-    "--buildFolder <path>": "Optional: Use a specific build folder when creating the image",
-    "--layerCacheFolder <path>": "Optional: Folder to cache base layers between builds",
-    "--version": "Get containerify version",
-};
+const program = new commander_1.Command();
+program
+    .name("containerify")
+    .description("A CLI-tool for creating container images.")
+    .option("--from <registry/image:tag>", "Optional: Shorthand to specify fromRegistry and fromImage in one argument")
+    .option("--to <registry/image:tag>", "Optional: Shorthand to specify toRegistry and toImage in one argument")
+    .option("--fromImage <name:tag>", "Required: Image name of base image - [path/]image:tag")
+    .option("--toImage <name:tag>", "Required: Image name of target image - [path/]image:tag")
+    .option("--folder <full path>", "Required: Base folder of node application (contains package.json)")
+    .option("--file <path>", "Optional: Name of configuration file (defaults to containerify.json if found on path)")
+    .option("--doCrossMount", "Optional: Cross mount image layers from the base image (only works if fromImage and toImage are in the same registry) (default, false)")
+    .option("--fromRegistry <registry url>", "Optional: URL of registry to pull base image from - Default, https,//registry-1.docker.io/v2/")
+    .option("--fromToken <token>", "Optional: Authentication token for from registry")
+    .option("--toRegistry <registry url>", "Optional: URL of registry to push base image to - Default, https,//registry-1.docker.io/v2/")
+    .option("--optimisticToRegistryCheck", "Treat redirects as layer existing in remote registry. Potentially unsafe) but can save bandwidth.")
+    .option("--toToken <token>", "Optional: Authentication token for target registry")
+    .option("--toTar <path>", "Optional: Export to tar file")
+    .option("--toDocker", "Optional: Export to local docker registry")
+    .option("--registry <path>", "Optional: Convenience argument for setting both from and to registry")
+    .option("--platform <platform>", "Optional: Preferred platform) e.g. linux/amd64 or arm64")
+    .option("--token <path>", "Optional: Convenience argument for setting token for both from and to registry")
+    .option("--user <user>", "Optional: User account to run process in container - default, 1000 (empty for customContent)")
+    .option("--workdir <directory>", "Optional: Workdir where node app will be added and run from - default, /app (empty for customContent)")
+    .option("--entrypoint <entrypoint>", "Optional: Entrypoint when starting container - default, npm start (empty for customContent)")
+    .option("--label, --labels <labels...>", "Optional: Comma-separated list of key value pairs to use as labels")
+    .option("--env, --envs <envs...>", "Optional: Comma-separated list of key value pairs to use av environment variables.")
+    .option("--preserveTimeStamp", "Optional: Preserve timestamps on files in the added layers. This might help with cache invalidation.")
+    .option("--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")
+    .option("--verbose", "Verbose logging")
+    .option("--allowInsecureRegistries", "Allow insecure registries (with self-signed/untrusted cert)")
+    .option("--allowNoPushAuth", "Allow pushing images without a authentication/token to registries that allow it")
+    .option("--customContent <dirs/files...>", "Optional: Skip normal node_modules and applayer and include specified root folder files/directories instead. You can specify as local-path,absolute-container-path if you want to place it in a specific location")
+    .option("--extraContent <dirs/files...>", "Optional: Add specific content. Specify as local-path,absolute-container-path)local-path2,absolute-container-path2 etc")
+    .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")
+    .version(version_1.VERSION, "--version", "Get containerify version");
+program.parse(process.argv);
 function setKeyValue(target, keyValue, separator = "=", defaultValue) {
     var _a;
     const [k, v] = keyValue.split(separator, 2);
     target[k.trim()] = (_a = v === null || v === void 0 ? void 0 : v.trim()) !== null && _a !== void 0 ? _a : defaultValue;
 }
-const cliLabels = {};
-commander_1.program.on("option:label", (ops) => {
-    setKeyValue(cliLabels, ops);
-});
-const cliEnv = {};
-commander_1.program.on("option:env", (ops) => {
-    setKeyValue(cliEnv, ops);
-});
-const cliOptions = Object.entries(possibleArgs)
-    .reduce((program, [k, v]) => {
-    program.option(k, v);
-    return program;
-}, commander_1.program)
-    .parse()
-    .opts();
-if (cliOptions.version) {
-    console.log(`containerify v${version_1.VERSION}`);
-    process.exit(0);
-}
-const keys = Object.keys(possibleArgs).map((k) => k.split(" ")[0].replace("--", ""));
+const cliOptions = program.opts();
+const keys = program.options.map((x) => { var _a; return (_a = x.long) === null || _a === void 0 ? void 0 : _a.replace("--", ""); });
 const defaultOptions = {
     workdir: "/app",
     user: "1000",
@@ -107,26 +91,17 @@ Object.keys(configFromFile).forEach((k) => {
     }
 });
 const labelsOpt = {};
-(_b = (_a = cliOptions.labels) === null || _a === void 0 ? void 0 : _a.split(",")) === null || _b === void 0 ? void 0 : _b.forEach((x) => setKeyValue(labelsOpt, x));
-Object.keys(labelsOpt)
-    .filter((l) => Object.keys(cliLabels).includes(l))
-    .forEach((l) => {
-    exitWithErrorIf(true, `Label ${l} specified both with --labels and --label`);
-});
-const labels = Object.assign(Object.assign(Object.assign({}, configFromFile.labels), labelsOpt), cliLabels); //Let cli arguments override file
+(_a = cliOptions.labels) === null || _a === void 0 ? void 0 : _a.forEach((labels) => labels.split(",").forEach((label) => setKeyValue(labelsOpt, label)));
+const labels = Object.assign(Object.assign({}, configFromFile.labels), labelsOpt); //Let cli arguments override file
 const envOpt = {};
-(_d = (_c = cliOptions.envs) === null || _c === void 0 ? void 0 : _c.split(",")) === null || _d === void 0 ? void 0 : _d.forEach((x) => setKeyValue(envOpt, x));
-Object.keys(envOpt)
-    .filter((l) => Object.keys(cliEnv).includes(l))
-    .forEach((l) => {
-    exitWithErrorIf(true, `Env ${l} specified both with --envs and --env`);
-});
-const envs = Object.assign(Object.assign(Object.assign({}, configFromFile.envs), envOpt), cliEnv); //Let cli arguments override file
+(_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 = {};
-(_e = configFromFile.customContent) === null || _e === void 0 ? void 0 : _e.forEach((c) => setKeyValue(customContent, c, ":", c));
-(_f = cliOptions.customContent) === null || _f === void 0 ? void 0 : _f.split(",").forEach((c) => setKeyValue(customContent, c, ":", c));
+(_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)));
 const cliExtraContent = {};
-(_g = cliOptions.extraContent) === null || _g === void 0 ? void 0 : _g.split(",").forEach((x) => setKeyValue(cliExtraContent, x, ":"));
+(_e = cliOptions.extraContent) === null || _e === void 0 ? void 0 : _e.forEach((extras) => extras.split(",").forEach((extra) => setKeyValue(cliExtraContent, extra, ":")));
 const extraContent = Object.assign(Object.assign({}, configFromFile.extraContent), cliExtraContent);
 const cliParams = (0, utils_1.omit)(cliOptions, [
     "label",
@@ -147,11 +122,12 @@ const options = Object.assign(Object.assign(Object.assign({}, defaultOptions), s
 function exitWithErrorIf(check, error) {
     if (check) {
         logger_1.default.error("ERROR: " + error);
-        commander_1.program.help({ error: true });
+        program.help({ error: true });
     }
 }
 if (options.verbose)
     logger_1.default.enableDebug();
+exitWithErrorIf(!!options.setTimeStamp && !!options.preserveTimeStamp, "Do not set both --preserveTimeStamp and --setTimeStamp");
 exitWithErrorIf(!!options.registry && !!options.fromRegistry, "Do not set both --registry and --fromRegistry");
 exitWithErrorIf(!!options.from && !!options.fromRegistry, "Do not set both --from and --fromRegistry");
 exitWithErrorIf(!!options.registry && !!options.from, "Do not set both --registry and --from");
@@ -202,11 +178,11 @@ if (options.toRegistry && !options.toRegistry.endsWith("/"))
     options.toRegistry += "/";
 if (options.fromRegistry && !options.fromRegistry.endsWith("/"))
     options.fromRegistry += "/";
-if (!options.fromRegistry && !((_k = (_j = (_h = options.fromImage) === null || _h === void 0 ? void 0 : _h.split(":")) === null || _j === void 0 ? void 0 : _j[0]) === null || _k === void 0 ? void 0 : _k.includes("/"))) {
+if (!options.fromRegistry && !((_h = (_g = (_f = options.fromImage) === null || _f === void 0 ? void 0 : _f.split(":")) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.includes("/"))) {
     options.fromImage = "library/" + options.fromImage;
 }
 Object.keys(options.customContent).forEach((p) => {
-    exitWithErrorIf(!fs.existsSync(p), "Could not find " + p + " in the base folder " + options.folder);
+    exitWithErrorIf(!fs.existsSync(p), `Could not find ${p} in the base folder ${options.folder}`);
 });
 if (options.layerCacheFolder) {
     if (!fs.existsSync(options.layerCacheFolder)) {
@@ -215,7 +191,7 @@ if (options.layerCacheFolder) {
             fs.mkdirSync(options.layerCacheFolder, { recursive: true });
         }
         catch (e) {
-            exitWithErrorIf(true, "Failed to create layer cache folder");
+            exitWithErrorIf(true, `Failed to create layer cache folder ${e}`);
         }
     }
     if (!options.layerCacheFolder.endsWith("/")) {
@@ -223,13 +199,13 @@ if (options.layerCacheFolder) {
     }
 }
 Object.keys(options.extraContent).forEach((k) => {
-    exitWithErrorIf(!fs.existsSync(options.folder + k), "Could not find `" + k + "` in the folder " + options.folder);
+    exitWithErrorIf(!fs.existsSync(options.folder + k), `Could not find '${k}' in the folder ${options.folder}`);
 });
 function run(options) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
         if (!(yield fse.pathExists(options.folder)))
-            throw new Error("No such folder: " + options.folder);
+            throw new Error(`No such folder: ${options.folder}`);
         const tmpdir = fs.mkdtempSync(path.join(os.tmpdir(), "containerify-"));
         logger_1.default.debug("Using " + tmpdir);
         const fromdir = yield (0, fileutil_1.ensureEmptyDir)(path.join(tmpdir, "from"));
@@ -254,7 +230,7 @@ function run(options) {
             const toRegistry = yield (0, registry_1.createRegistry)(options.toRegistry, options.toImage, allowInsecure, options.toToken, options.optimisticToRegistryCheck);
             yield toRegistry.upload(options.toImage, todir, options.doCrossMount, originalManifest, options.fromImage);
         }
-        logger_1.default.debug("Deleting " + tmpdir + " ...");
+        logger_1.default.debug(`Deleting ${tmpdir} ...`);
         yield fse.remove(tmpdir);
         logger_1.default.debug("Done");
     });

package/lib/dockerExporter.js

@@ -18,7 +18,7 @@ function isAvailable() {
         try {
             yield execAsync("docker -v");
         }
-        catch (e) {
+        catch (_a) {
             return false;
         }
         return true;

package/lib/logger.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable no-console */
 Object.defineProperty(exports, "__esModule", { value: true });
 let debugEnabled = false;
 function timeString() {

package/lib/registry.js

@@ -130,7 +130,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 } = URL.parse(registryBaseUrl);
+        const { hostname } = new URL.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);
@@ -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.1";

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.1";

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "containerify",
-	"version": "3.1.2",
+	"version": "3.2.1",
 	"description": "Build node.js docker images without docker",
 	"main": "./lib/cli.js",
 	"scripts": {
 		"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",
+		"lint": "eslint . --ext .ts --fix",
 		"typecheck": "tsc --noEmit",
 		"watch": "tsc --watch",
 		"check": "npm run lint && npm run typecheck",
@@ -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/"
@@ -36,20 +36,23 @@
 		"image"
 	],
 	"dependencies": {
-		"commander": "^11.0.0",
-		"fs-extra": "^11.1.0",
-		"tar": "^6.1.13"
+		"commander": "^13.1.0",
+		"fs-extra": "^11.3.0",
+		"tar": "^6.2.1"
 	},
 	"devDependencies": {
-		"@types/fs-extra": "^11.0.1",
-		"@types/minizlib": "^2.1.4",
-		"@types/node": "^18.11.19",
-		"@types/tar": "^6.1.3",
-		"@typescript-eslint/eslint-plugin": "^5.51.0",
-		"@typescript-eslint/parser": "^5.51.0",
-		"eslint": "^8.33.0",
-		"eslint-config-prettier": "^8.6.0",
-		"prettier": "^2.8.3",
-		"typescript": "^5.1.6"
+		"@eslint/eslintrc": "^3.3.1",
+		"@eslint/js": "^9.23.0",
+		"@types/fs-extra": "^11.0.4",
+		"@types/minizlib": "^2.1.7",
+		"@types/node": "^22.13.9",
+		"@types/tar": "^6.1.13",
+		"@typescript-eslint/eslint-plugin": "^8.26.0",
+		"@typescript-eslint/parser": "^8.26",
+		"eslint": "^9.21.0",
+		"eslint-config-prettier": "^10.1.1",
+		"globals": "^16.0.0",
+		"prettier": "^3.5.3",
+		"typescript": "^5.8.2"
 	}
 }