Skip to content

Commit 02bb080

Browse files
committed
fix(docker): match Docker Desktop's variant operating system names
Docker Desktop 4.71 on WSL 2 reports OperatingSystem as "Docker Desktop (containerized)", so the exact match missed it and the WSL 2 endpoint default never applied. Match the "Docker Desktop" prefix. Refs #3880 Signed-off-by: fede-kamel <[email protected]>
1 parent 3062b7e commit 02bb080

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

‎crates/openshell-driver-docker/src/lib.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6559,10 +6559,12 @@ fn default_docker_supervisor_grpc_endpoint(
65596559
format!("{scheme}://{host}:{gateway_port}")
65606560
}
65616561

6562+
/// Docker Desktop reports `OperatingSystem` as `Docker Desktop`, or with a
6563+
/// variant suffix such as `Docker Desktop (containerized)` (4.71, WSL 2).
65626564
fn docker_info_reports_docker_desktop(info: &SystemInfo) -> bool {
65636565
info.operating_system
65646566
.as_deref()
6565-
.is_some_and(|os| os.trim().eq_ignore_ascii_case("docker desktop"))
6567+
.is_some_and(|os| os.trim().to_ascii_lowercase().starts_with("docker desktop"))
65666568
}
65676569

65686570
/// Whether the gateway process itself runs inside WSL. This is about the

‎crates/openshell-driver-docker/src/tests.rs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2972,6 +2972,15 @@ fn docker_supervisor_network_uses_host_alias_for_wsl_gateway_on_docker_desktop()
29722972
DockerSupervisorNetwork::detect(&docker_desktop_wsl2_info(), true),
29732973
DockerSupervisorNetwork::WslDockerDesktop
29742974
);
2975+
// Docker Desktop 4.71 on WSL 2 reports a variant suffix.
2976+
let containerized = SystemInfo {
2977+
operating_system: Some("Docker Desktop (containerized)".to_string()),
2978+
..docker_desktop_wsl2_info()
2979+
};
2980+
assert_eq!(
2981+
DockerSupervisorNetwork::detect(&containerized, true),
2982+
DockerSupervisorNetwork::WslDockerDesktop
2983+
);
29752984
}
29762985

29772986
#[test]

0 commit comments

Comments
 (0)