@travetto/pack 3.2.7 → 3.2.9

package/package.json

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

package/support/bin/config-util.ts

@@ -1,24 +1,41 @@
 import { DockerPackConfig } from './types';
 
+const ifElse = (check: string, succ: string, fail: string): string => `${check} && (${succ}) || (${fail})`;
+
 /**
  * Common utils for setting up pack config
  */
 export class PackConfigUtil {
+  /**
+   * Docker setup
+   */
+  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.dockerRuntimeUser;
-    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 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"]`;
   }
 }

package/support/bin/types.ts

@@ -25,7 +25,8 @@ export type DockerPackConfig = {
   dockerPort?: number[];
   dockerPush?: boolean;
   dockerRegistry?: string;
-  dockerRuntimeUser: {
+  dockerRuntime: {
+    folder: string;
     user: string;
     uid: number;
     group: string;

package/support/cli.pack_docker.ts

@@ -1,10 +1,11 @@
 import { path, RootIndex } from '@travetto/manifest';
 import { CliCommand, CliFlag, CliUtil, CliValidationError } from '@travetto/cli';
+import { GlobalEnv } from '@travetto/base';
+import { Ignore } from '@travetto/schema';
 
 import { DockerPackOperation } from './bin/docker-operation';
 import { BasePackCommand, PackOperationShape } from './pack.base';
-import { GlobalEnv } from '@travetto/base';
-import { Ignore } from '@travetto/schema';
+import { DockerPackConfig } from './bin/types';
 
 const NODE_MAJOR = GlobalEnv.nodeVersion.replace('v', '').split('.')[0];
 const DEFAULT_USER_ID = 2000;
@@ -33,12 +34,7 @@ export class PackDockerCommand extends BasePackCommand {
   dockerRuntimeUserSrc?: string;
 
   @Ignore()
-  dockerRuntimeUser: {
-    user: string;
-    uid: number;
-    group: string;
-    gid: number;
-  };
+  dockerRuntime: DockerPackConfig['dockerRuntime'];
 
   async validate(...unknownArgs: string[]): Promise<CliValidationError[] | undefined> {
     const errs: CliValidationError[] = [];
@@ -70,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.dockerRuntimeUser = { user, uid, group, gid };
+    this.dockerRuntime = { user, uid, group, gid, folder: `/${DEFAULT_USER}` };
   }
 
   getOperations(): PackOperationShape<this>[] {

package/support/pack.dockerfile.ts

@@ -1,11 +1,8 @@
 import { DockerPackFactory } from './bin/types';
 import { PackConfigUtil } from './bin/config-util';
 
-export const factory: DockerPackFactory = cfg => `
-FROM ${cfg.dockerImage}
-${PackConfigUtil.dockerUserCommand(cfg)}
-WORKDIR /app
-COPY . .
-${cfg.dockerPort?.map(port => `EXPOSE ${port}`).join('\n') ?? ''}
-ENTRYPOINT ["/app/${cfg.mainName}.sh"]
-`;
+export const factory: DockerPackFactory = cfg => [
+  PackConfigUtil.dockerInit(cfg),
+  PackConfigUtil.dockerWorkspace(cfg),
+  PackConfigUtil.dockerEntrypoint(cfg),
+].join('\n');