@travetto/pack 3.4.5 → 3.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.4.5",
+  "version": "3.4.7",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -32,7 +32,7 @@
     "rollup": "^4.5.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.3"
+    "@travetto/cli": "^3.4.5"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/config-util.ts

@@ -14,28 +14,76 @@ export class PackConfigUtil {
   }
 
   /**
-   * Common docker environment setup
+   * Setup docker ports
    */
-  static dockerWorkspace(cfg: DockerPackConfig): string {
-    const { folder, user, group, uid, gid } = cfg.dockerRuntime;
+  static dockerPorts(cfg: DockerPackConfig): string {
+    return (cfg.dockerPort?.map(x => `EXPOSE ${x}`) ?? []).join('\n');
+  }
+
+  /**
+   * Setup docker user
+   * @returns
+   */
+  static dockerUser(cfg: DockerPackConfig): string {
+    const { user, group, uid, gid } = cfg.dockerRuntime;
     return [
-      ...cfg.dockerPort?.map(x => `EXPOSE ${x}`) ?? [],
       user !== 'root' ? ifElse(
         'RUN which useradd',
         `groupadd --gid ${gid} ${group} && useradd -u ${uid} -g ${group} ${user}`,
         `addgroup -g ${gid} ${group} && adduser -D -G ${group} -u ${uid} ${user}`
       ) : '',
+    ].join('\n');
+  }
+
+  /**
+   * Setup docker runtime folder
+   */
+  static dockerAppFolder(cfg: DockerPackConfig): string {
+    const { folder, user, group } = cfg.dockerRuntime;
+    return [
       `RUN mkdir ${folder} && chown ${user}:${group} ${folder}`,
-      `USER ${user}`,
-      `WORKDIR ${folder}`,
-      `COPY --chown="${user}:${group}" . .`,
     ].join('\n');
   }
 
+  /**
+   * Docker app files copied and permissioned
+   */
+  static dockerAppFiles(cfg: DockerPackConfig): string {
+    const { user, group, folder } = cfg.dockerRuntime;
+    return `COPY --chown="${user}:${group}" . ${folder}`;
+  }
+
   /**
    * Entrypoint creation for a docker configuration
    */
   static dockerEntrypoint(cfg: DockerPackConfig): string {
-    return `ENTRYPOINT ["${cfg.dockerRuntime.folder}/${cfg.mainName}.sh"]`;
+    const { user, folder } = cfg.dockerRuntime;
+    return [
+      `USER ${user}`,
+      `WORKDIR ${folder}`,
+      `ENTRYPOINT ["${folder}/${cfg.mainName}.sh"]`,
+    ].join('\n');
+  }
+  /**
+   * Common docker environment setup
+   */
+  static dockerWorkspace(cfg: DockerPackConfig): string {
+    return [
+      this.dockerPorts(cfg),
+      this.dockerUser(cfg),
+      this.dockerAppFolder(cfg),
+      this.dockerAppFiles(cfg),
+    ].filter(x => !!x).join('\n');
+  }
+
+  /**
+   * Common docker file setup
+   */
+  static dockerStandardFile(cfg: DockerPackConfig): string {
+    return [
+      this.dockerInit(cfg),
+      this.dockerWorkspace(cfg),
+      this.dockerEntrypoint(cfg)
+    ].join('\n');
   }
 }

package/support/pack.dockerfile.ts

@@ -1,8 +1,4 @@
 import { DockerPackFactory } from './bin/types';
 import { PackConfigUtil } from './bin/config-util';
 
-export const factory: DockerPackFactory = cfg => [
-  PackConfigUtil.dockerInit(cfg),
-  PackConfigUtil.dockerWorkspace(cfg),
-  PackConfigUtil.dockerEntrypoint(cfg),
-].join('\n');
+export const factory: DockerPackFactory = cfg => PackConfigUtil.dockerStandardFile(cfg);