Skip to content

Issue 530: Fix container engine detection when podman-docker installed #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Issue 530: Fix container engine detection when podman-docker installed #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70049b0
Issue 530: Fix container engine detection when podman-docker installed
alexhunt7 Mar 20, 2021
254ab41
Merge branch 'main' into issue-530
Alexhuszagh May 29, 2022
42cf98f
Updated CHANGELOG.
Alexhuszagh May 29, 2022
cf9991b
Only default to podman on Linux
Alexhuszagh May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- #588 - fix ci: bump openssl version in freebsd again
- #552 - Added CHANGELOG.md automation
- #543 - Added environment variables to control the UID and GID in the container
- #538 - changed default container engine to podman
- #534 - fix image builds with update of dependencies
- #524 - docker: Add Nix Store volume support
- #502 - fix ci: bump openssl version in freebsd
Expand Down
2 changes: 2 additions & 0 deletions src/docker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ const PODMAN: &str = "podman";
fn get_container_engine() -> Result<std::path::PathBuf, which::Error> {
if let Ok(ce) = env::var("CROSS_CONTAINER_ENGINE") {
which::which(ce)
} else if cfg!(target_os = "linux") {
which::which(PODMAN).or_else(|_| which::which(DOCKER))
} else {
which::which(DOCKER).or_else(|_| which::which(PODMAN))
}
Expand Down