@travetto/pack 3.2.5 → 3.2.7

package/__index__.ts

@@ -1 +1,2 @@
-export type { CommonPackConfig, DockerPackFactory, DockerPackConfig } from './support/bin/types';
+export type { CommonPackConfig, DockerPackFactory, DockerPackConfig } from './support/bin/types';
+export { PackConfigUtil } from './support/bin/config-util';

package/package.json

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

package/support/bin/config-util.ts

@@ -0,0 +1,24 @@
+import { DockerPackConfig } from './types';
+
+/**
+ * Common utils for setting up pack config
+ */
+export class PackConfigUtil {
+  /**
+   * 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 '';
+    }
+  }
+}

package/support/pack.dockerfile.ts

@@ -1,21 +1,9 @@
-import { DockerPackConfig, DockerPackFactory } from './bin/types';
-
-function buildRuntimeUser(cfg: DockerPackConfig): string {
-  const { user, group, uid, gid } = cfg.dockerRuntimeUser;
-  if (user !== 'root') {
-    return [
-      '',
-      `RUN addgroup -g ${gid} ${group} && adduser -S -u ${uid} ${user} ${group}`,
-      `USER ${user}`
-    ].join('\n');
-  } else {
-    return '';
-  }
-}
+import { DockerPackFactory } from './bin/types';
+import { PackConfigUtil } from './bin/config-util';
 
 export const factory: DockerPackFactory = cfg => `
 FROM ${cfg.dockerImage}
-${buildRuntimeUser(cfg)}
+${PackConfigUtil.dockerUserCommand(cfg)}
 WORKDIR /app
 COPY . .
 ${cfg.dockerPort?.map(port => `EXPOSE ${port}`).join('\n') ?? ''}