@travetto/pack 3.2.8 → 3.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.2.8",
+  "version": "3.2.9",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",

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');
+  static dockerInit(cfg: DockerPackConfig): string {
+    return `FROM ${cfg.dockerImage}`;
   }
 
   /**
    * 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 '';
-    }
-  }
-
-  /**
-   * Expose ports
-   */
-  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

@@ -66,7 +66,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');