@travetto/pack 3.2.5 → 3.2.6

package/package.json

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

package/support/bin/util.ts

@@ -4,6 +4,7 @@ import { path, RootIndex } from '@travetto/manifest';
 import { AppError, ExecUtil, ExecutionOptions } from '@travetto/base';
 
 import { ActiveShellCommand } from './shell';
+import { DockerPackConfig } from './types';
 
 export class PackUtil {
   /**
@@ -77,4 +78,22 @@ export class PackUtil {
       throw new AppError(stderr || message || 'An unexpected error has occurred');
     }
   }
+
+  /**
+   * Generate a docker user creation command
+   */
+  static generateDockerUserCommand(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 { PackUtil } from './bin/util';
 
 export const factory: DockerPackFactory = cfg => `
 FROM ${cfg.dockerImage}
-${buildRuntimeUser(cfg)}
+${PackUtil.generateDockerUserCommand(cfg)}
 WORKDIR /app
 COPY . .
 ${cfg.dockerPort?.map(port => `EXPOSE ${port}`).join('\n') ?? ''}