Conversation
Add a shared `docker_program()` helper and use it for PTY terminal sessions so Windows resolves `docker.exe` instead of Docker Desktop's extensionless `docker` script. This avoids portable-pty launching a non-Win32 executable and fixes terminal startup on Windows.
There was a problem hiding this comment.
Pull request overview
This PR fixes Windows terminal startup by ensuring PTY-launched docker compose exec resolves to docker.exe (not Docker Desktop’s extensionless docker script), avoiding CreateProcessW “not a valid Win32 application” failures when spawning via portable-pty.
Changes:
- Added a shared
crate::docker::docker_program()helper to pick an appropriate Docker CLI executable (with Windows-specific resolution todocker.exe). - Updated PTY terminal sessions to use
docker_program()when spawningdocker compose exec.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src-tauri/src/terminal.rs | Use crate::docker::docker_program() when spawning Docker via portable-pty for terminal sessions. |
| src-tauri/src/docker.rs | Introduce docker_program() helper to reliably select docker.exe on Windows (absolute path when found on PATH). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+48
to
+54
| return std::env::var_os("PATH") | ||
| .into_iter() | ||
| .flat_map(|paths| std::env::split_paths(&paths).collect::<Vec<_>>()) | ||
| .map(|dir| dir.join("docker.exe")) | ||
| .find(|candidate| candidate.is_file()) | ||
| .map(|path| path.into_os_string()) | ||
| .unwrap_or_else(|| "docker.exe".into()); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add a shared
docker_program()helper and use it for PTY terminal sessions so Windows resolvesdocker.exeinstead of Docker Desktop's extensionlessdockerscript. This avoids portable-pty launching a non-Win32 executable and fixes terminal startup on Windows.