@travetto/pack 3.2.8 → 3.3.0

package/README.md

@@ -232,12 +232,11 @@ cd $ROOT
 echo "Generating Docker File $DIST/Dockerfile @travetto/pack/support/pack.dockerfile"
 
 echo "FROM node:20-alpine" > $DIST/Dockerfile
-echo "" >> $DIST/Dockerfile
-echo "RUN addgroup -g 2000 app && adduser -S -u 2000 app app" >> $DIST/Dockerfile
+echo "RUN which addgroup && (addgroup -g 2000 app && adduser -S -u 2000 app app) || (groupadd -g 2000 app && useradd -r -u 2000 -g app app)" >> $DIST/Dockerfile
+echo "RUN mkdir /app && chown app:app /app" >> $DIST/Dockerfile
 echo "USER app" >> $DIST/Dockerfile
 echo "WORKDIR /app" >> $DIST/Dockerfile
-echo "COPY . ." >> $DIST/Dockerfile
-echo "" >> $DIST/Dockerfile
+echo "COPY --chown=\"app:app\" . ." >> $DIST/Dockerfile
 echo "ENTRYPOINT [\"/app/todo-app.sh\"]" >> $DIST/Dockerfile
 
 # Pulling Docker Base Image node:20-alpine 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.2.8",
+  "version": "3.3.0",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -28,12 +28,12 @@
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-terser": "^0.4.3",
-    "@travetto/base": "^3.2.8",
-    "rollup": "^3.26.3",
+    "@travetto/base": "^3.3.0",
+    "rollup": "^3.27.2",
     "rollup-plugin-sourcemaps": "^0.6.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.2.3"
+    "@travetto/cli": "^3.3.0"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/config-util.ts

@@ -1,5 +1,7 @@
 import { DockerPackConfig } from './types';
 
+const ifElse = (check: string, succ: string, fail: string): string => `${check} && (${succ}) || (${fail})`;
+
 /**
  * Common utils for setting up pack config
  */
@@ -7,49 +9,33 @@ export class PackConfigUtil {
   /**
    * Docker setup
    */
-  static dockerSetup(cfg: DockerPackConfig): string {
-    return [
-      `FROM ${cfg.dockerImage}`,
-      `WORKDIR /${cfg.dockerRuntime.folder}`,
-    ].join('\n');
-  }
-
-  /**
-   * Generate a docker user creation command
-   */
-  static dockerUserCommand(cfg: DockerPackConfig): string {
-    const { user, group, uid, gid } = cfg.dockerRuntime;
-    if (user !== 'root') {
-      return [
-        '',
-        `RUN which addgroup && \
-  ( addgroup -g ${gid} ${group} && adduser -S -u ${uid} ${user} ${group} ) || \
-  ( groupadd -g ${gid} ${group} && useradd -r -u ${uid} -g ${group} ${user} )`,
-        `USER ${user}`
-      ].join('\n');
-    } else {
-      return '';
-    }
+  static dockerInit(cfg: DockerPackConfig): string {
+    return `FROM ${cfg.dockerImage}`;
   }
 
   /**
-   * Expose ports
+   * Common docker environment setup
    */
-  static dockerExposePorts(cfg: DockerPackConfig): string {
-    return cfg.dockerPort?.map(x => `EXPOSE ${x}`).join('\n') ?? '';
-  }
-
-  /**
-   * Copy workspace contents
-   */
-  static dockerCopyWorkspace(cfg: DockerPackConfig): string {
-    return `COPY --chown="${cfg.dockerRuntime.user}:${cfg.dockerRuntime.group}" . .`;
+  static dockerWorkspace(cfg: DockerPackConfig): string {
+    const { folder, user, group, uid, gid } = cfg.dockerRuntime;
+    return [
+      ...cfg.dockerPort?.map(x => `EXPOSE ${x}`) ?? [],
+      user !== 'root' ? ifElse(
+        'RUN which addgroup',
+        `addgroup -g ${gid} ${group} && adduser -S -u ${uid} ${user} ${group}`,
+        `groupadd -g ${gid} ${group} && useradd -r -u ${uid} -g ${group} ${user}`
+      ) : '',
+      `RUN mkdir ${folder} && chown ${user}:${group} ${folder}`,
+      `USER ${user}`,
+      `WORKDIR ${folder}`,
+      `COPY --chown="${user}:${group}" . .`,
+    ].join('\n');
   }
 
   /**
    * Entrypoint creation for a docker configuration
    */
   static dockerEntrypoint(cfg: DockerPackConfig): string {
-    return `ENTRYPOINT ["/${cfg.dockerRuntime.folder}/${cfg.mainName}.sh"]`;
+    return `ENTRYPOINT ["${cfg.dockerRuntime.folder}/${cfg.mainName}.sh"]`;
   }
 }

package/support/cli.pack_docker.ts

@@ -7,7 +7,6 @@ import { DockerPackOperation } from './bin/docker-operation';
 import { BasePackCommand, PackOperationShape } from './pack.base';
 import { DockerPackConfig } from './bin/types';
 
-const NODE_MAJOR = GlobalEnv.nodeVersion.replace('v', '').split('.')[0];
 const DEFAULT_USER_ID = 2000;
 const DEFAULT_USER = 'app';
 
@@ -19,7 +18,7 @@ export class PackDockerCommand extends BasePackCommand {
   @CliFlag({ desc: 'Docker Factory source ', short: 'df', envVars: ['PACK_DOCKER_FACTORY'] })
   dockerFactory = '@travetto/pack/support/pack.dockerfile';
   @CliFlag({ desc: 'Docker Image to extend ', short: 'di', envVars: ['PACK_DOCKER_IMAGE'] })
-  dockerImage = `node:${NODE_MAJOR}-alpine`;
+  dockerImage = `node:${GlobalEnv.nodeVersion}-alpine`;
   @CliFlag({ desc: 'Docker Image Name ', short: 'dn', envVars: ['PACK_DOCKER_IMAGE'] })
   dockerName = CliUtil.monoRoot ? '<module>' : CliUtil.getSimpleModuleName();
   @CliFlag({ desc: 'Docker Image Tag ', short: 'dt', envVars: ['PACK_DOCKER_TAGS'] })
@@ -66,7 +65,7 @@ export class PackDockerCommand extends BasePackCommand {
     const gid = groupIsNum ? +groupOrGid : DEFAULT_USER_ID;
     const group = (!groupIsNum ? groupOrGid : undefined) || DEFAULT_USER;
     const user = (!userIsNum ? userOrUid : undefined) || DEFAULT_USER;
-    this.dockerRuntime = { user, uid, group, gid, folder: DEFAULT_USER };
+    this.dockerRuntime = { user, uid, group, gid, folder: `/${DEFAULT_USER}` };
   }
 
   getOperations(): PackOperationShape<this>[] {

package/support/pack.dockerfile.ts

@@ -2,9 +2,7 @@ import { DockerPackFactory } from './bin/types';
 import { PackConfigUtil } from './bin/config-util';
 
 export const factory: DockerPackFactory = cfg => [
-  PackConfigUtil.dockerSetup(cfg),
-  PackConfigUtil.dockerUserCommand(cfg),
-  PackConfigUtil.dockerCopyWorkspace(cfg),
-  PackConfigUtil.dockerExposePorts(cfg),
+  PackConfigUtil.dockerInit(cfg),
+  PackConfigUtil.dockerWorkspace(cfg),
   PackConfigUtil.dockerEntrypoint(cfg),
 ].join('\n');