containerify 2.5.0 → 2.5.2

package/lib/appLayerCreator.js

@@ -167,18 +167,20 @@ function parseCommandLineToParts(entrypoint) {
 function addAppLayers(options, config, todir, manifest, tmpdir) {
     return __awaiter(this, void 0, void 0, function* () {
         if (options.customContent.length > 0) {
+            if (options.nonDefaults.workdir)
+                yield addWorkdirLayer(options, config, options.nonDefaults.workdir);
+            if (options.nonDefaults.entrypoint)
+                yield addEntrypointLayer(options, config, options.nonDefaults.entrypoint);
+            if (options.nonDefaults.user)
+                yield addUserLayer(options, config, options.nonDefaults.user);
             yield addEnvsLayer(options, config);
             yield addLabelsLayer(options, config);
             yield addDataLayer(tmpdir, todir, options, config, manifest, options.customContent, "custom");
         }
         else {
-            addEmptyLayer(config, options, `WORKDIR ${options.workdir}`, (config) => (config.config.WorkingDir = options.workdir));
-            const entrypoint = parseCommandLineToParts(options.entrypoint);
-            addEmptyLayer(config, options, `ENTRYPOINT ${JSON.stringify(entrypoint)}`, (config) => (config.config.Entrypoint = entrypoint));
-            addEmptyLayer(config, options, `USER ${options.user}`, (config) => {
-                config.config.User = options.user;
-                config.container_config.User = options.user;
-            });
+            yield addWorkdirLayer(options, config, options.workdir);
+            yield addEntrypointLayer(options, config, options.entrypoint);
+            yield addUserLayer(options, config, options.user);
             yield addEnvsLayer(options, config);
             yield addLabelsLayer(options, config);
             const appFiles = (yield fs_1.promises.readdir(options.folder)).filter((l) => !ignore.includes(l));
@@ -192,6 +194,25 @@ function addAppLayers(options, config, todir, manifest, tmpdir) {
         }
     });
 }
+function addWorkdirLayer(options, config, workdir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        addEmptyLayer(config, options, `WORKDIR ${workdir}`, (config) => (config.config.WorkingDir = workdir));
+    });
+}
+function addEntrypointLayer(options, config, entrypoint) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const entrypointParts = parseCommandLineToParts(entrypoint);
+        addEmptyLayer(config, options, `ENTRYPOINT ${JSON.stringify(entrypoint)}`, (config) => (config.config.Entrypoint = entrypointParts));
+    });
+}
+function addUserLayer(options, config, user) {
+    return __awaiter(this, void 0, void 0, function* () {
+        addEmptyLayer(config, options, `USER ${user}`, (config) => {
+            config.config.User = user;
+            config.container_config.User = user;
+        });
+    });
+}
 function addLabelsLayer(options, config) {
     return __awaiter(this, void 0, void 0, function* () {
         if (Object.keys(options.labels).length > 0) {

package/lib/cli.js

@@ -38,9 +38,9 @@ const possibleArgs = {
     "--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",
-    "--workdir <directory>": "Optional: Workdir where node app will be added and run from - default: /app",
-    "--entrypoint <entrypoint>": "Optional: Entrypoint when starting container - default: npm start",
+    "--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.",
@@ -128,9 +128,14 @@ const cliParams = (0, utils_1.omit)(cliOptions, [
     "customContent",
     "extraContent",
 ]);
-const options = Object.assign(Object.assign(Object.assign(Object.assign({}, defaultOptions), configFromFile), cliParams), { customContent,
+const setOptions = Object.assign(Object.assign(Object.assign({}, configFromFile), cliParams), { customContent,
     extraContent,
     labels, envs: Object.entries(envs).map(([k, v]) => `${k}=${v}`) });
+const options = Object.assign(Object.assign(Object.assign({}, defaultOptions), setOptions), { nonDefaults: {
+        user: setOptions.user,
+        workdir: setOptions.workdir,
+        entrypoint: setOptions.entrypoint,
+    } });
 function exitWithErrorIf(check, error) {
     if (check) {
         logger_1.default.error("ERROR: " + error);
@@ -196,7 +201,7 @@ if (options.layerCacheFolder) {
         options.layerCacheFolder += "/";
     }
 }
-Object.keys(options.extraContent).forEach(k => {
+Object.keys(options.extraContent).forEach((k) => {
     exitWithErrorIf(!fs.existsSync(options.folder + k), "Could not find `" + k + "` in the folder " + options.folder);
 });
 function run(options) {

package/lib/types.d.ts

@@ -80,5 +80,10 @@ export type Options = {
     layerOwner?: string;
     buildFolder?: string;
     layerCacheFolder?: string;
+    nonDefaults: {
+        user?: string;
+        workdir?: string;
+        entrypoint?: string;
+    };
 };
 export {};

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.5.0";
+export declare const VERSION = "2.5.2";

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "containerify",
-	"version": "2.5.0",
+	"version": "2.5.2",
 	"description": "Build node.js docker images without docker",
 	"main": "./lib/cli.js",
 	"scripts": {
@@ -18,11 +18,6 @@
 	},
 	"author": "Erlend Oftedal <erlend@oftedal.no>",
 	"license": "Apache-2.0",
-	"dependencies": {
-		"commander": "^10.0.0",
-		"fs-extra": "^11.1.0",
-		"tar": "^6.1.13"
-	},
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/eoftedal/containerify.git"
@@ -35,6 +30,11 @@
 		"container",
 		"image"
 	],
+	"dependencies": {
+		"commander": "^11.0.0",
+		"fs-extra": "^11.1.0",
+		"tar": "^6.1.13"
+	},
 	"devDependencies": {
 		"@types/fs-extra": "^11.0.1",
 		"@types/minizlib": "^2.1.4",
@@ -45,6 +45,6 @@
 		"eslint": "^8.33.0",
 		"eslint-config-prettier": "^8.6.0",
 		"prettier": "^2.8.3",
-		"typescript": "^4.9.5"
+		"typescript": "^5.1.6"
 	}
 }