@getmonoceros/workbench 1.6.5 → 1.6.7

package/dist/bin.js

@@ -804,7 +804,8 @@ function buildDevcontainerJson(opts, dockerMode = "rootful") {
     features[f.devcontainerKey] = f.options;
   }
   const featuresField = Object.keys(features).length > 0 ? { features } : void 0;
-  const idmapSuffix = dockerMode === "rootless" ? ",idmap=true" : "";
+  void dockerMode;
+  const idmapSuffix = "";
   const homeMounts = [];
   for (const f of resolvedFeatures) {
     const allSubs = [
@@ -832,9 +833,7 @@ function buildDevcontainerJson(opts, dockerMode = "rootful") {
   }
   const mounts = [...homeMounts];
   const mountsField = mounts.length > 0 ? { mounts } : {};
-  const workspaceMountField = dockerMode === "rootless" ? {
-    workspaceMount: `source=\${localWorkspaceFolder},target=/workspaces/${opts.name},type=bind${idmapSuffix}`
-  } : {};
+  const workspaceMountField = {};
   return {
     name: opts.name,
     image: BASE_IMAGE,
@@ -848,24 +847,15 @@ function buildDevcontainerJson(opts, dockerMode = "rootful") {
   };
 }
 function buildComposeYaml(opts, dockerMode = "rootful") {
+  void dockerMode;
   const lines = ["services:"];
-  const isRootless = dockerMode === "rootless";
   lines.push("  workspace:");
   lines.push(`    image: ${BASE_IMAGE}`);
   lines.push("    command: 'sleep infinity'");
   lines.push("    cap_add:");
   lines.push("      - NET_ADMIN");
   lines.push("    volumes:");
-  if (isRootless) {
-    lines.push("      - type: bind");
-    lines.push("        source: ..");
-    lines.push(`        target: /workspaces/${opts.name}`);
-    lines.push("        bind:");
-    lines.push("          create_host_path: true");
-    lines.push("          idmap: true");
-  } else {
-    lines.push(`      - ..:/workspaces/${opts.name}:cached`);
-  }
+  lines.push(`      - ..:/workspaces/${opts.name}:cached`);
   const resolvedFeatures = resolveFeatures(opts);
   for (const f of resolvedFeatures) {
     const allSubs = [
@@ -873,16 +863,7 @@ function buildComposeYaml(opts, dockerMode = "rootful") {
       ...f.persistentHomeFiles.map((entry2) => entry2.path)
     ];
     for (const sub of allSubs) {
-      if (isRootless) {
-        lines.push("      - type: bind");
-        lines.push(`        source: ../home/${sub}`);
-        lines.push(`        target: /home/node/${sub}`);
-        lines.push("        bind:");
-        lines.push("          create_host_path: true");
-        lines.push("          idmap: true");
-      } else {
-        lines.push(`      - ../home/${sub}:/home/node/${sub}`);
-      }
+      lines.push(`      - ../home/${sub}:/home/node/${sub}`);
     }
   }
   for (const svcId of opts.services) {
@@ -2274,6 +2255,7 @@ function providerSetupHint(host, provider) {
     const install = installCommandForOS({
       brew: "brew install gh",
       winget: "winget install --id GitHub.cli",
+      linuxBrew: "brew install gh",
       linuxDocsUrl: "https://github.com/cli/cli#installation"
     });
     return {
@@ -2939,7 +2921,7 @@ function warnOnDeprecatedFeatureRefs(containerFeatures, globalConfig, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.6.5" : "dev";
+var CLI_VERSION = true ? "1.6.7" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola11 } from "consola";