Adding support for Podman #344
Merged
Conversation
This file contains 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
|
Please move the style changes to a separate PR. It's really hard to review the actual changes with them mixed in. |
- Via the new container_engine parameter in Cross.toml, the user can now specify whether they want to use Podman or Docker. - Several changes to src/docker.rs to pass in different options based on whether docker or podman is being used. This also mandates the use of `--userns host` which does require bumping the minimum Docker version.
ostrosco
changed the title
|
Sorry about that. I've reverted everything back save for the changes to add podman support. |
reitermarkus
reviewed
Nov 9, 2019
- In version 1.6.3 of Podman, support for anonymous volues was added which allows for Docker and Podman to both add /cargo/bin for MacOS compatibility. The Docker command was reverted to its original version and the minimum version of Podman is now set to 1.6.3. - Minor updates to the README to indicate that Docker and Podman are both supported and one of the must be installed.
- Instead of requiring the user to specify which container engine they would prefer via the container_engine option, cross will now check to see which one is installed and use it. Defaults to docker if both are installed.
- Changing the get_container_engine() call to use Result<> instead of Option<> and using combinators rather than ifs. - Added which::Error to the list of errors in the error_chain. This also required disabling the default features of which which uses failure by default rather than std::error::Error.
reitermarkus
approved these changes
Nov 15, 2019
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Nov 15, 2019
344: Adding support for Podman r=reitermarkus a=ostrosco - Via the new container_engine parameter in Cross.toml, the user can now specify whether they want to use Podman or Docker. - Several changes to src/docker.rs to pass in different options based on whether docker or podman is being used. This also mandates the use of `--userns host` which does require bumping the minimum Docker version. - Updates to the code base based on rustfmt and clippy recommendations. Co-authored-by: ostrosco <[email protected]>
Build succeeded
|
|
Thanks, @ostrosco, great work! |
|
Thanks and you're welcome! |
Alexhuszagh
added
enhancement
A-container-engine
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.
specify whether they want to use Podman or Docker.
docker or podman is being used. This also mandates the use of
--userns hostwhich does require bumping the minimum Docker version.