@travetto/pack 4.0.0-rc.7 → 4.0.0-rc.9

package/README.md

@@ -237,12 +237,22 @@ cd $TRV_OUT
 npx rollup -c $TRV_OUT/node_modules/@travetto/pack/support/rollup/build.js
 cd $ROOT
 
+# Pulling Docker Base Image node:20-alpine 
+
+echo "Pulling Docker Base Image node:20-alpine"
+
+docker pull node:20-alpine
+
+# Detected Image OS node:20-alpine as alpine 
+
+echo "Detected Image OS node:20-alpine as alpine"
+
 # Generating Docker File $DIST/Dockerfile @travetto/pack/support/pack.dockerfile 
 
 echo "Generating Docker File $DIST/Dockerfile @travetto/pack/support/pack.dockerfile"
 
 echo "FROM node:20-alpine" > $DIST/Dockerfile
-echo "RUN which useradd && (groupadd --gid 2000 app && useradd -u 2000 -g app app) || (addgroup -g 2000 app && adduser -D -G app -u 2000 app)" >> $DIST/Dockerfile
+echo "RUN addgroup -g 2000 app && adduser -D -G app -u 2000 app" >> $DIST/Dockerfile
 echo "RUN mkdir /app && chown app:app /app" >> $DIST/Dockerfile
 echo "COPY --chown=\"app:app\" . /app" >> $DIST/Dockerfile
 echo "ENV NODE_OPTIONS=\"\"" >> $DIST/Dockerfile
@@ -250,12 +260,6 @@ echo "USER app" >> $DIST/Dockerfile
 echo "WORKDIR /app" >> $DIST/Dockerfile
 echo "ENTRYPOINT [\"/app/todo-app.sh\"]" >> $DIST/Dockerfile
 
-# Pulling Docker Base Image node:20-alpine 
-
-echo "Pulling Docker Base Image node:20-alpine"
-
-docker pull node:20-alpine
-
 # Building Docker Container latest 
 
 echo "Building Docker Container latest"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "4.0.0-rc.7",
+  "version": "4.0.0-rc.9",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -29,12 +29,12 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/base": "^4.0.0-rc.6",
-    "@travetto/terminal": "^4.0.0-rc.6",
+    "@travetto/base": "^4.0.0-rc.8",
+    "@travetto/terminal": "^4.0.0-rc.8",
     "rollup": "^4.9.6"
   },
   "peerDependencies": {
-    "@travetto/cli": "^4.0.0-rc.6"
+    "@travetto/cli": "^4.0.0-rc.8"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/config-util.ts

@@ -1,7 +1,5 @@
 import { DockerPackConfig } from './types';
 
-const ifElse = (check: string, succ: string, fail: string): string => `${check} && (${succ}) || (${fail})`;
-
 /**
  * Common utils for setting up pack config
  */
@@ -17,12 +15,15 @@ export class PackConfigUtil {
    * Install docker pages in either apk or apt environments
    */
   static dockerPackageInstall(cfg: DockerPackConfig): string {
-    const { packages } = cfg.dockerRuntime;
+    const { os, packages } = cfg.dockerRuntime;
     if (packages?.length) {
-      return ifElse('RUN which apk',
-        `apk --update add ${packages.join(' ')} && rm -rf /var/cache/apk/*`,
-        `apt update && apt install -y ${packages.join(' ')} && rm -rf  /var/lib/{apt,dpkg,cache,log}/`,
-      );
+      switch (os) {
+        case 'alpine': return `RUN apk --update add ${packages.join(' ')} && rm -rf /var/cache/apk/*`;
+        case 'debian': return `RUN apt update && apt install -y ${packages.join(' ')} && rm -rf  /var/lib/{apt,dpkg,cache,log}/`;
+        case 'centos': return `RUN yum -y install ${packages.join(' ')} && yum -y clean all && rm -fr /var/cache`;
+        case 'unknown':
+        default: throw new Error('Unable to install packages in an unknown os');
+      }
     } else {
       return '';
     }
@@ -39,14 +40,18 @@ export class PackConfigUtil {
    * Setup docker user
    */
   static dockerUser(cfg: DockerPackConfig): string {
-    const { user, group, uid, gid } = cfg.dockerRuntime;
-    return [
-      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');
+    const { os, user, group, uid, gid } = cfg.dockerRuntime;
+    if (user === 'root') {
+      return '';
+    } else {
+      switch (os) {
+        case 'alpine': return `RUN addgroup -g ${gid} ${group} && adduser -D -G ${group} -u ${uid} ${user}`;
+        case 'debian':
+        case 'centos': return `RUN groupadd --gid ${gid} ${group} && useradd -u ${uid} -g ${group} ${user}`;
+        case 'unknown':
+        default: throw new Error('Unable to add user/group for an unknown os');
+      }
+    }
   }
 
   /**

package/src/types.ts

@@ -33,6 +33,7 @@ export type DockerPackConfig = {
   dockerPush?: boolean;
   dockerRegistry?: string;
   dockerRuntime: {
+    os?: 'alpine' | 'debian' | 'centos' | 'unknown';
     packages?: string[];
     folder: string;
     user: string;

package/support/bin/docker-operation.ts

@@ -14,6 +14,18 @@ export class DockerPackOperation {
     return (cfg.dockerTag ?? []).map(x => cfg.dockerRegistry ? `${cfg.dockerRegistry}/${cfg.dockerName}:${x}` : `${cfg.dockerName}:${x}`);
   }
 
+  /**
+   * Detect image os
+   */
+  static async* detectDockerImageOs(cfg: DockerPackConfig): AsyncIterable<string[]> {
+    // Read os before writing
+    cfg.dockerRuntime.os = await PackUtil.runCommand(
+      ['docker', 'run', '--entrypoint', '/bin/sh', cfg.dockerImage, '-c', 'cat /etc/*release*']
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    ).then(out => out.match(/\b(?:debian|alpine|centos)\b/i)?.[0].toLowerCase() as 'alpine' ?? 'unknown');
+    yield* PackOperation.title(cfg, cliTpl`${{ title: 'Detected Image OS' }} ${{ param: cfg.dockerImage }} as ${{ param: cfg.dockerRuntime.os }}`);
+  }
+
   /**
    * Write Docker File
    */

package/support/cli.pack_docker.ts

@@ -79,8 +79,9 @@ export class PackDockerCommand extends BasePackCommand {
   getOperations(): PackOperationShape<this>[] {
     return [
       ...super.getOperations(),
-      DockerPackOperation.writeDockerFile,
       DockerPackOperation.pullDockerBaseImage,
+      DockerPackOperation.detectDockerImageOs,
+      DockerPackOperation.writeDockerFile,
       DockerPackOperation.buildDockerContainer,
       DockerPackOperation.pushDockerContainer
     ];