vercel-vm-factory 0.6.8 → 0.8.8

package/README.md

@@ -5,6 +5,7 @@ Create a tiny Vercel Container deployment: copy `wsterm` from `ghcr.io/v1xingyue
 ```bash
 npx vercel-vm-factory create \
   --vm-image ubuntu \
+  --shell /bin/bash \
   --project ws-shell-ubuntu \
   --auth-mode basic \
   --auth-user admin \
@@ -56,6 +57,14 @@ VM image presets:
 - `ubuntu` -> `ubuntu:24.04`
 - `debian` -> `debian:13-slim`
 
+Shell options:
+
+- `/bin/bash`
+- `/bin/zsh`
+- `/bin/sh`
+
+Choosing bash or zsh adds the matching package to the generated Dockerfile when the VM image does not already include it.
+
 Custom VM image:
 
 ```bash

package/deploy-vm.mjs

@@ -13,6 +13,7 @@ const vmImages = {
   ubuntu: "ubuntu:24.04",
   debian: "debian:13-slim",
 };
+const shells = ["/bin/bash", "/bin/zsh", "/bin/sh"];
 
 const { command, args } = parseCommand(process.argv.slice(2));
 const scriptRoot = path.resolve(import.meta.dirname);
@@ -20,7 +21,11 @@ const workspaceRoot = process.cwd();
 const stateRoot = path.join(homedir(), ".vercel-vm-factory");
 const defaultsPath = path.join(stateRoot, "defaults.json");
 const legacyDefaultsPath = path.join(scriptRoot, ".defaults.json");
-const codeDefaults = { "vm-image": "alpine", from: defaultWsShellImage };
+const codeDefaults = {
+  "vm-image": "alpine",
+  from: defaultWsShellImage,
+  shell: "/bin/sh",
+};
 const packagedDefaults = {
   ...(await readDefaults(legacyDefaultsPath)),
   ...codeDefaults,
@@ -90,6 +95,7 @@ async function main() {
     process.env.WS_SHELL_IMAGE ??
     defaults.from ??
     defaultWsShellImage;
+  const shell = await chooseShell(args.shell ?? defaults.shell ?? "/bin/sh");
   const prod = args.prod !== "false";
   const dryRun = Boolean(args["dry-run"]);
   const skipLink = Boolean(args["skip-link"]);
@@ -107,7 +113,12 @@ async function main() {
     ".generated",
     project,
   );
-  const dockerfile = makeDockerfile({ vmImage, wsShellImage });
+  const dockerfile = makeDockerfile({
+    shell,
+    vmImage,
+    vmImageName,
+    wsShellImage,
+  });
 
   await rm(appDir, { recursive: true, force: true });
   await mkdir(appDir, { recursive: true });
@@ -118,6 +129,7 @@ async function main() {
     project,
     scope: scope || "default",
     source: wsShellImage,
+    shell,
     auth: authMode,
     ...(usesGitHubAuth(authMode) ? { callback: oauthRedirectUrl } : {}),
     dockerfile: path.join(appDir, "Dockerfile.vercel"),
@@ -173,6 +185,7 @@ async function main() {
     scope: scope || undefined,
     project,
     from: wsShellImage,
+    shell,
     "auth-mode": authMode,
     "auth-user": authUsername,
     "auth-password": authPassword,
@@ -272,15 +285,12 @@ async function installVercelCli() {
     );
 
   const install = await choosePackageInstall();
-  const rl = createInterface({ input, output });
   const answer = (
-    await rl.question(
-      `Vercel CLI is not installed. Install it with "${install.command} ${install.args.join(" ")}"? [y/N]: `,
+    await askText(
+      `Vercel CLI is not installed. Install with ${install.command} ${install.args.join(" ")}?`,
+      "N",
     )
-  )
-    .trim()
-    .toLowerCase();
-  rl.close();
+  ).toLowerCase();
 
   if (answer !== "y" && answer !== "yes")
     throw new Error("Vercel CLI is required. Exiting.");
@@ -319,6 +329,7 @@ async function doctor() {
   printKeyValue("project", defaults.project || "not set");
   printKeyValue("scope", defaults.scope || "not set");
   printKeyValue("source image", defaults.from || defaultWsShellImage);
+  printKeyValue("shell", defaults.shell || "/bin/sh");
   printKeyValue("auth mode", defaults["auth-mode"] || "not set");
   printKeyValue(
     "auth user",
@@ -342,33 +353,56 @@ async function doctor() {
   );
 }
 
-function makeDockerfile({ vmImage, wsShellImage }) {
+function makeDockerfile({ shell, vmImage, vmImageName, wsShellImage }) {
+  const shellInstall = makeShellInstall({ shell, vmImageName });
   return `ARG WS_SHELL_IMAGE=${wsShellImage}
 ARG VM_IMAGE=${vmImage}
 
 FROM \${WS_SHELL_IMAGE} AS ws-shell
 FROM \${VM_IMAGE} AS vm
-
+${shellInstall ? `\n${shellInstall}\n` : ""}
 # wsterm already embeds the web UI; runtime config comes from environment variables.
 COPY --from=ws-shell /app/bin/wsterm /app/bin/wsterm
 
 WORKDIR /app
 ENV ENABLE_SSL=false
 EXPOSE 80
-CMD ["/app/bin/wsterm","-bind",":80","-fork","/bin/sh"]
+CMD ["/app/bin/wsterm","-bind",":80","-fork","${shell}"]
 `;
 }
 
+function makeShellInstall({ shell, vmImageName }) {
+  const packageName = path.basename(shell);
+  if (packageName === "sh") return "";
+
+  if (vmImageName === "alpine")
+    return `RUN apk add --no-cache ${packageName}`;
+
+  if (vmImageName === "ubuntu" || vmImageName === "debian")
+    return `RUN apt-get update \\
+    && apt-get install -y --no-install-recommends ${packageName} \\
+    && rm -rf /var/lib/apt/lists/*`;
+
+  return `RUN if command -v ${shell} >/dev/null 2>&1; then \\
+      true; \\
+    elif command -v apk >/dev/null 2>&1; then \\
+      apk add --no-cache ${packageName}; \\
+    elif command -v apt-get >/dev/null 2>&1; then \\
+      apt-get update \\
+      && apt-get install -y --no-install-recommends ${packageName} \\
+      && rm -rf /var/lib/apt/lists/*; \\
+    else \\
+      echo "Cannot install ${packageName}: unsupported VM image package manager" >&2; \\
+      exit 1; \\
+    fi`;
+}
+
 async function value(name, question, fallback) {
   const current = args[name] ?? fallback;
   if (args[name]) return args[name];
   if (!input.isTTY) return current || "";
 
-  const rl = createInterface({ input, output });
-  const answer = (
-    await rl.question(`${question}${fallback ? ` [${fallback}]` : ""}: `)
-  ).trim();
-  rl.close();
+  const answer = await askText(question, fallback);
   return answer || current || "";
 }
 
@@ -376,10 +410,8 @@ async function secret(name, question, fallback) {
   if (args[name]) return args[name];
   if (!input.isTTY) return fallback || "";
 
-  const rl = createInterface({ input, output });
   const placeholder = fallback ? mask(fallback) : "skip";
-  const answer = (await rl.question(`${question} [${placeholder}]: `)).trim();
-  rl.close();
+  const answer = await askText(question, placeholder);
   return answer || fallback || "";
 }
 
@@ -387,10 +419,10 @@ async function optionalValue(name, question, fallback) {
   if (args[name] !== undefined) return args[name];
   if (!input.isTTY) return "";
 
-  const rl = createInterface({ input, output });
-  const suffix = fallback ? ` [${fallback}; Enter to skip]` : " [skip]";
-  const answer = (await rl.question(`${question}${suffix}: `)).trim();
-  rl.close();
+  const answer = await askText(
+    question,
+    fallback ? `${fallback}; Enter to skip` : "skip",
+  );
   return answer;
 }
 
@@ -424,15 +456,14 @@ async function chooseAuthMode(fallback) {
   }
   if (!input.isTTY) return modes.has(fallback) ? fallback : "basic";
 
-  console.log(color.bold("Choose authentication"));
-  console.log(`  ${color.cyan("1")}. basic username/password`);
-  console.log(`  ${color.cyan("2")}. GitHub OAuth`);
-  console.log(`  ${color.cyan("3")}. both`);
-  console.log(`  ${color.cyan("4")}. none`);
+  printChoices("Authentication", [
+    ["1", "basic", "username/password"],
+    ["2", "github", "GitHub OAuth"],
+    ["3", "both", "basic + GitHub OAuth"],
+    ["4", "none", "no app auth"],
+  ]);
 
-  const rl = createInterface({ input, output });
-  const answer = (await rl.question(`Authentication [${fallback}]: `)).trim();
-  rl.close();
+  const answer = await askText("Authentication", fallback);
 
   if (!answer) return modes.has(fallback) ? fallback : "basic";
   if (modes.has(answer)) return answer;
@@ -457,17 +488,16 @@ async function chooseVmImage(fallback) {
   if (!input.isTTY) return fallback;
 
   const names = Object.keys(vmImages);
-  console.log(color.bold("Choose VM image"));
-  names.forEach((name, index) =>
-    console.log(
-      `  ${color.cyan(String(index + 1))}. ${name} ${color.dim(`(${vmImages[name]})`)}`,
-    ),
+  printChoices(
+    "VM image",
+    names.map((name, index) => [
+      String(index + 1),
+      name,
+      vmImages[name],
+    ]).concat([["4", "custom", "enter a full image name"]]),
   );
-  console.log(`  ${color.cyan("4")}. custom image`);
 
-  const rl = createInterface({ input, output });
-  const answer = (await rl.question(`VM image [${fallback}]: `)).trim();
-  rl.close();
+  const answer = await askText("VM image", fallback);
 
   if (!answer) return fallback;
   if (vmImages[answer]) return answer;
@@ -481,6 +511,27 @@ async function chooseVmImage(fallback) {
   return answer;
 }
 
+async function chooseShell(fallback) {
+  if (args.shell) return args.shell;
+  if (!input.isTTY) return fallback;
+
+  printChoices(
+    "Shell",
+    shells.map((shell, index) => [
+      String(index + 1),
+      shell,
+      index === shells.length - 1 ? "default" : "",
+    ]),
+  );
+
+  const answer = await askText("Shell", fallback);
+
+  if (!answer) return fallback;
+  if (shells.includes(answer)) return answer;
+  if (/^[1-3]$/.test(answer)) return shells[Number(answer) - 1];
+  return answer;
+}
+
 async function readDefaults(file) {
   try {
     return JSON.parse(await readFile(file, "utf8"));
@@ -638,18 +689,30 @@ function findLastUrl(text) {
 }
 
 function printHeader() {
-  console.log(color.bold(color.cyan("Vercel VM Factory")));
-  console.log(
-    color.dim("Build a Container deployment from a tiny Dockerfile.vercel"),
-  );
+  console.log("");
+  console.log(color.cyan(" __     ____  __   _____           _                   "));
+  console.log(color.cyan(" \\ \\   / /  \\/  | |  ___|_ _  ___| |_ ___  _ __ _   _ "));
+  console.log(color.cyan("  \\ \\ / /| |\\/| | | |_ / _` |/ __| __/ _ \\| '__| | | |"));
+  console.log(color.cyan("   \\ V / | |  | | |  _| (_| | (__| || (_) | |  | |_| |"));
+  console.log(color.cyan("    \\_/  |_|  |_| |_|  \\__,_|\\___|\\__\\___/|_|   \\__, |"));
+  console.log(color.cyan("                                                 |___/ "));
+  console.log(color.dim("        Vercel Container VM deployment helper"));
   console.log("");
 }
 
 function printSummary(items) {
+  const entries = Object.entries(items);
+  const keyWidth = Math.max(...entries.map(([key]) => key.length), 1);
+  const valueWidth = Math.max(...entries.map(([, value]) => String(value).length), 1);
+  const width = keyWidth + valueWidth + 5;
+
   console.log(color.bold("Deployment plan"));
+  console.log(color.cyan(`+${"-".repeat(width)}+`));
   for (const [key, value] of Object.entries(items)) {
-    printKeyValue(key, value);
+    const line = `${key.padEnd(keyWidth)}  ${String(value).padEnd(valueWidth)}`;
+    console.log(`${color.cyan("|")} ${line} ${color.cyan("|")}`);
   }
+  console.log(color.cyan(`+${"-".repeat(width)}+`));
   console.log("");
 }
 
@@ -676,6 +739,28 @@ function printKeyValue(key, value) {
   console.log(`${color.dim(`${key.padEnd(14)} `)}${value}`);
 }
 
+async function askText(question, fallback = "") {
+  const suffix = fallback ? color.dim(` [${fallback}]`) : "";
+  const rl = createInterface({ input, output });
+  const answer = (
+    await rl.question(
+      `${color.cyan("?")} ${color.bold(question)}${suffix}\n${color.dim("> ")} `,
+    )
+  ).trim();
+  rl.close();
+  return answer;
+}
+
+function printChoices(title, choices) {
+  console.log("");
+  console.log(color.bold(title));
+  for (const [key, label, detail] of choices) {
+    const hint = detail ? ` ${color.dim(detail)}` : "";
+    console.log(`  ${color.cyan(key)}  ${label}${hint}`);
+  }
+  console.log("");
+}
+
 function step(text) {
   console.log(`${color.cyan("->")} ${text}`);
 }
@@ -706,6 +791,7 @@ Options:
   --project NAME       Vercel project name
   --scope SLUG         Optional Vercel team/user scope slug
   --from IMAGE         Source image for /app/bin/wsterm
+  --shell PATH         /bin/bash, /bin/zsh, or /bin/sh
   --auth-mode MODE     basic, github, both, or none
   --auth-user VALUE    Username/password auth user
   --auth-password VAL  Username/password auth password

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel-vm-factory",
-  "version": "0.6.8",
+  "version": "0.8.8",
   "description": "Create Vercel Container deployments for ws-shell from selectable VM images.",
   "license": "MIT",
   "type": "module",