Fix docker detection. #755
Merged
Conversation
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
Alexhuszagh
commented
Jun 4, 2022
| @@ -126,6 +136,7 @@ pub fn run( | |||
| let runner = config.runner(target)?; | |||
|
|
|||
| let mut docker = docker_command("run")?; | |||
| let is_docker = get_is_docker(get_container_engine().unwrap(), verbose)?; | |||
There was a problem hiding this comment.
Note that this can't fail due to the above command: docker_command ensures that get_container_engine is not an error.
Currently, docker detection fails under a few cases: 1. If `podman_docker` is installed, so the filename is docker but the actual executable is podman. 2. If the executable has a suffix, such as `.exe` on Windows, because we check if the executable `ends_with(DOCKER)`. The only reliable way to fix both these issues, IE, if the actual engine is docker and not an alias, and if the executable does not contain a suffix, is to query the container engine. This might not be ideal for performance reasons, but is the only reliable way to fix these issues. Emulated docker will have an output of `Emulate Docker CLI using podman.`, while docker itself will have an output similar to `Docker version 20.10.16, build aa7e414`. Closes cross-rs#530. Closes cross-rs#538.
|
Build succeeded: |
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.
Currently, docker detection fails under a few cases:
podman_dockeris installed, so the filename is docker but the actual executable is podman..exeon Windows, because we check if the executableends_with(DOCKER).The only reliable way to fix both these issues, IE, if the actual engine is docker and not an alias, and if the executable does not contain a suffix, is to query the container engine. This might not be ideal for performance reasons, but is the only reliable way to fix these issues.
Closes #530.
Closes #538.