@getmonoceros/workbench 1.6.11 → 1.6.12

package/dist/bin.js

@@ -2711,17 +2711,23 @@ function formatRootlessNotSupportedError() {
     ``,
     `To fix, switch back to standard rootful Docker:`,
     ``,
-    cyan2(`  systemctl --user disable --now docker.service docker.socket`),
+    cyan2(
+      `  systemctl --user stop docker.service docker.socket 2>/dev/null || true`
+    ),
     cyan2(`  dockerd-rootless-setuptool.sh uninstall`),
-    cyan2(`  rm -rf ~/.local/share/docker`),
-    cyan2(`  unset DOCKER_HOST`),
+    cyan2(`  rootlesskit rm -rf ~/.local/share/docker`),
+    cyan2(`  unset DOCKER_HOST DOCKER_CONTEXT`),
     cyan2(`  sudo systemctl enable --now docker`),
     cyan2(`  sudo usermod -aG docker $USER`),
     ``,
-    `Verify with ${cyan2("docker info | grep -i rootless")} \u2014 it should`,
-    `produce no output. Then re-run.`,
+    `If you added DOCKER_HOST or DOCKER_CONTEXT to ~/.bashrc /`,
+    `~/.profile (the rootless setup may have suggested it), remove`,
+    `those lines too \u2014 the 'unset' above only affects your current`,
+    `shell. Otherwise new terminals keep pointing at the rootless`,
+    `socket and Monoceros's auto-recovery has nothing to fall back to.`,
     ``,
-    `Background: see ${cyan2("docs/docker-on-linux.md")} in the workbench repo.`
+    `Then re-run. Background: see ${cyan2("docs/docker-on-linux.md")} in`,
+    `the workbench repo.`
   ].join("\n");
 }
 
@@ -3004,7 +3010,7 @@ function warnOnDeprecatedFeatureRefs(containerFeatures, globalConfig, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.6.11" : "dev";
+var CLI_VERSION = true ? "1.6.12" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola11 } from "consola";