feat(sbx): install Docker/Multipass on demand from /sbx launch
CI / rust client (hh) (macos-latest) (push) Waiting to run
CI / rust client (hh) (ubuntu-latest) (push) Waiting to run
CI / rust coverage (push) Waiting to run
CI / python server (3.10) (push) Waiting to run
CI / python server (3.11) (push) Waiting to run
CI / python server (3.12) (push) Waiting to run
CI / headless e2e smoke (push) Waiting to run
CI / dependency audit (push) Waiting to run
CI / secret scanning (push) Waiting to run
CI / rust client (hh) (macos-latest) (push) Waiting to run
CI / rust client (hh) (ubuntu-latest) (push) Waiting to run
CI / rust coverage (push) Waiting to run
CI / python server (3.10) (push) Waiting to run
CI / python server (3.11) (push) Waiting to run
CI / python server (3.12) (push) Waiting to run
CI / headless e2e smoke (push) Waiting to run
CI / dependency audit (push) Waiting to run
CI / secret scanning (push) Waiting to run
Previously, launching a sandbox on a machine without the backend binary died with a raw "not installed" error and no path forward. Now the missing backend can be installed in-line, gated on explicit consent, so a fresh checkout can go from zero to a running sandbox without leaving the TUI. Folded into the existing `/sbx launch` verb rather than a new command (menu is already dense): `/sbx launch docker|multipass [image] install`. The `install` token opts in; without it the user gets an actionable error naming the exact retry. The token is filtered out of positional image parsing so it never shadows a custom image. The install runs off-thread inside the existing spawn_launch task, before provisioning, so the TUI never blocks and the *launching guard is cleared via BrokerMsg on failure. A fresh Docker install also leaves its daemon up, so launch proceeds straight through. Scripts (detect-first, never silent, --plan dry-run, idempotent if already present): - ensure-multipass.sh (new): Linux→snap (clear failure if snapd absent), macOS→brew cask, Windows→winget. - ensure-docker.sh: new --install mode using Docker's OFFICIAL, GPG-verified apt repo (docker-ce) on Debian/Ubuntu, with dnf (Fedora/RHEL) and pacman (Arch) fallbacks. Deliberately avoids piping get.docker.com into a root shell. Existing daemon-start path intact. sbx.rs: docker_installed()/multipass_installed() detectors and ensure_docker_install()/ensure_multipass_install() wrappers; ENSURE_MULTIPASS const. ui.rs: help text documents the [install] option on both backends. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
+62
-8
@@ -1585,7 +1585,14 @@ fn handle_command(
|
||||
let start_daemon = args
|
||||
.iter()
|
||||
.any(|a| matches!(*a, "--start" | "--start-daemon" | "-y"));
|
||||
let mut pos = args.iter().copied().filter(|a| !a.starts_with('-'));
|
||||
// Consent token: if the selected backend's binary is missing,
|
||||
// `install` opts in to installing it (detect-then-install). It's
|
||||
// a positional keyword (not the image), so filter it out below.
|
||||
let want_install = args.iter().any(|a| matches!(*a, "install" | "--install"));
|
||||
let mut pos = args
|
||||
.iter()
|
||||
.copied()
|
||||
.filter(|a| !a.starts_with('-') && !matches!(*a, "install"));
|
||||
let first = pos.next();
|
||||
if matches!(first, Some("virtualbox") | Some("vbox")) {
|
||||
// VirtualBox runs locally in its own GUI — host & guest each
|
||||
@@ -1623,18 +1630,47 @@ fn handle_command(
|
||||
.next()
|
||||
.map(str::to_string)
|
||||
.unwrap_or_else(|| backend.default_image().to_string());
|
||||
if backend == sbx::Backend::Docker && !start_daemon && !sbx::docker_daemon_up() {
|
||||
// Is this backend's binary present? Docker/Multipass can be
|
||||
// installed on consent; Local needs nothing and vbox is
|
||||
// handled in its own branch above.
|
||||
let installed = match backend {
|
||||
sbx::Backend::Docker => sbx::docker_installed(),
|
||||
sbx::Backend::Multipass => sbx::multipass_installed(),
|
||||
_ => true,
|
||||
};
|
||||
let token = first.unwrap_or("docker");
|
||||
if !installed && !want_install {
|
||||
app.err(format!(
|
||||
"{} is not installed — retry with `/sbx launch {token} install` to install it (needs sudo)",
|
||||
backend.label()
|
||||
));
|
||||
} else if installed
|
||||
&& backend == sbx::Backend::Docker
|
||||
&& !start_daemon
|
||||
&& !sbx::docker_daemon_up()
|
||||
{
|
||||
app.err("docker daemon is not running — retry with `/sbx launch docker --start` to boot it (sudo), or run ./scripts/ensure-docker.sh in a terminal first");
|
||||
} else {
|
||||
// install_first ⇒ binary missing + consent given: install
|
||||
// it off-thread before provisioning (a fresh Docker
|
||||
// install also leaves its daemon up).
|
||||
let install_first = !installed;
|
||||
let sz = term.size().map(|s| (s.width, s.height)).unwrap_or((80, 24));
|
||||
let (rows, cols) = sbx_dims(sz.0, sz.1);
|
||||
*launching = true;
|
||||
let members: Vec<String> =
|
||||
app.users.iter().map(|u| u.username.clone()).collect();
|
||||
app.sys(format!(
|
||||
"summoning {} sandbox… (provisioning unix users; multipass boot ~30s)",
|
||||
backend.label()
|
||||
));
|
||||
if install_first {
|
||||
app.sys(format!(
|
||||
"installing {} (needs sudo)… then summoning the sandbox",
|
||||
backend.label()
|
||||
));
|
||||
} else {
|
||||
app.sys(format!(
|
||||
"summoning {} sandbox… (provisioning unix users; multipass boot ~30s)",
|
||||
backend.label()
|
||||
));
|
||||
}
|
||||
spawn_launch(
|
||||
backend,
|
||||
image,
|
||||
@@ -1643,6 +1679,7 @@ fn handle_command(
|
||||
rows,
|
||||
cols,
|
||||
start_daemon,
|
||||
install_first,
|
||||
pty_tx.clone(),
|
||||
broker_tx.clone(),
|
||||
app_tx.clone(),
|
||||
@@ -1751,7 +1788,7 @@ fn handle_command(
|
||||
let _ = atx.send(Net::Sys(format!("loading docker sandbox from {image}…")));
|
||||
spawn_launch(
|
||||
sbx::Backend::Docker, image, owner, members, rows,
|
||||
cols, false, pty, btx, atx,
|
||||
cols, false, false, pty, btx, atx,
|
||||
);
|
||||
}
|
||||
sbx::SnapKind::Multipass => {
|
||||
@@ -1766,7 +1803,7 @@ fn handle_command(
|
||||
spawn_launch(
|
||||
sbx::Backend::Multipass,
|
||||
sbx::Backend::Multipass.default_image().to_string(),
|
||||
owner, members, rows, cols, false, pty, btx, atx,
|
||||
owner, members, rows, cols, false, false, pty, btx, atx,
|
||||
);
|
||||
}
|
||||
Ok(Err(e)) => {
|
||||
@@ -2402,11 +2439,28 @@ fn spawn_launch(
|
||||
rows: u16,
|
||||
cols: u16,
|
||||
start_daemon: bool,
|
||||
install_first: bool,
|
||||
pty_tx: UnboundedSender<Vec<u8>>,
|
||||
broker_tx: UnboundedSender<BrokerMsg>,
|
||||
app_tx: UnboundedSender<Net>,
|
||||
) {
|
||||
tokio::spawn(async move {
|
||||
// Optional install step: the backend's binary was missing and the user
|
||||
// opted in. Runs before provisioning; failure aborts the launch (and
|
||||
// clears the *launching guard via BrokerMsg::Failed).
|
||||
if install_first {
|
||||
let res = tokio::task::spawn_blocking(move || match backend {
|
||||
sbx::Backend::Docker => sbx::ensure_docker_install(),
|
||||
sbx::Backend::Multipass => sbx::ensure_multipass_install(),
|
||||
_ => Ok(()),
|
||||
})
|
||||
.await;
|
||||
if let Err(e) = res.unwrap_or_else(|e| Err(anyhow::anyhow!("join: {e}"))) {
|
||||
let _ = app_tx.send(Net::Err(format!("install failed: {e}")));
|
||||
let _ = broker_tx.send(BrokerMsg::Failed);
|
||||
return;
|
||||
}
|
||||
}
|
||||
let name = SBX_NAME.to_string();
|
||||
let prep = {
|
||||
let (n, img) = (name.clone(), image.clone());
|
||||
|
||||
@@ -14,6 +14,8 @@ use std::sync::mpsc;
|
||||
|
||||
/// Helper that ensures the Docker daemon is running (ships in hh/scripts/).
|
||||
const ENSURE_DOCKER: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/scripts/ensure-docker.sh");
|
||||
/// Detect-first Multipass installer (ships in hh/scripts/).
|
||||
const ENSURE_MULTIPASS: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/scripts/ensure-multipass.sh");
|
||||
/// Detect-first VirtualBox installer (ships in hh/scripts/).
|
||||
const ENSURE_VBOX: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/scripts/ensure-vbox.sh");
|
||||
/// Baseline dev-toolchain installer run inside Docker sandboxes (hh/scripts/).
|
||||
@@ -23,6 +25,19 @@ const SBX_TOOLS_JSON: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/scripts/sandb
|
||||
/// Creates a fresh, cloud-init-provisioned Ubuntu VirtualBox VM (hh/scripts/).
|
||||
const VBOX_NEW: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/scripts/vbox-new.sh");
|
||||
|
||||
/// Is the `docker` binary installed? (`docker --version` succeeds.) This is a
|
||||
/// weaker check than `docker_daemon_up`: the CLI can be present while the daemon
|
||||
/// is down. We need both before a Docker sandbox can launch.
|
||||
pub fn docker_installed() -> bool {
|
||||
Command::new("docker")
|
||||
.arg("--version")
|
||||
.stdout(Stdio::null())
|
||||
.stderr(Stdio::null())
|
||||
.status()
|
||||
.map(|s| s.success())
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
/// Is the Docker daemon accepting connections? (`docker info` succeeds.)
|
||||
pub fn docker_daemon_up() -> bool {
|
||||
Command::new("docker")
|
||||
@@ -53,6 +68,54 @@ fn start_docker_daemon() -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Install Docker via `ensure-docker.sh --install --yes` (Docker's official,
|
||||
/// GPG-verified repo), then leave the daemon started. Consent is the caller's
|
||||
/// job (they passed `install`); the script is idempotent if Docker is present.
|
||||
/// Returns the script's last error line on failure (e.g. needs sudo).
|
||||
pub fn ensure_docker_install() -> Result<()> {
|
||||
let out = Command::new("bash")
|
||||
.arg(ENSURE_DOCKER)
|
||||
.arg("--install")
|
||||
.arg("--yes")
|
||||
.output()
|
||||
.context("running ensure-docker.sh --install")?;
|
||||
if !out.status.success() {
|
||||
let err = String::from_utf8_lossy(&out.stderr);
|
||||
let last = err.lines().last().unwrap_or("could not install Docker");
|
||||
anyhow::bail!("{last}");
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Is Multipass installed? (`multipass version` succeeds.)
|
||||
pub fn multipass_installed() -> bool {
|
||||
Command::new("multipass")
|
||||
.arg("version")
|
||||
.stdout(Stdio::null())
|
||||
.stderr(Stdio::null())
|
||||
.status()
|
||||
.map(|s| s.success())
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
/// Install Multipass via `ensure-multipass.sh --yes`. On Linux this is a snap
|
||||
/// install (the only supported channel). Consent is the caller's job; the
|
||||
/// script is idempotent if Multipass is already present. Returns the script's
|
||||
/// last error line on failure (e.g. snapd missing, or needs sudo).
|
||||
pub fn ensure_multipass_install() -> Result<()> {
|
||||
let out = Command::new("bash")
|
||||
.arg(ENSURE_MULTIPASS)
|
||||
.arg("--yes")
|
||||
.output()
|
||||
.context("running ensure-multipass.sh")?;
|
||||
if !out.status.success() {
|
||||
let err = String::from_utf8_lossy(&out.stderr);
|
||||
let last = err.lines().last().unwrap_or("could not install Multipass");
|
||||
anyhow::bail!("{last}");
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// ---- VirtualBox (local GUI VMs) ---------------------------------------------
|
||||
// VirtualBox is integrated as a *local* facility rather than a shared-PTY
|
||||
// backend: a room shares a VM by handing out its appliance, and each member
|
||||
|
||||
+4
-4
@@ -154,12 +154,12 @@ fn help_clusters(theme: &Theme) -> Vec<HelpCluster> {
|
||||
items: vec![
|
||||
// ── launch (one verb per backend) ──
|
||||
kv(
|
||||
"/sbx launch docker [image]",
|
||||
"Linux container — shared shell relayed to the room (default ubuntu:24.04 + auto dev toolchain)",
|
||||
"/sbx launch docker [image] [install]",
|
||||
"Linux container — shared shell relayed to the room (default ubuntu:24.04 + auto dev toolchain; append install if Docker is missing)",
|
||||
),
|
||||
kv(
|
||||
"/sbx launch multipass [image]",
|
||||
"full Ubuntu VM — shared shell relayed to the room (same dev toolchain)",
|
||||
"/sbx launch multipass [image] [install]",
|
||||
"full Ubuntu VM — shared shell relayed to the room (same dev toolchain; append install if Multipass is missing)",
|
||||
),
|
||||
kv(
|
||||
"/sbx launch vbox",
|
||||
|
||||
Reference in New Issue
Block a user