diff --git a/README.md b/README.md index 27e6b4773..68abb3d01 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,8 @@ This project is developed and maintained by the [Tools team][team]. One of these container engines is required: - [Docker](https://www.docker.com/). Note that on Linux non-sudo users need to be in the - `docker` group. Read the official [post-installation steps][post]. + `docker` group. Read the official [post-installation steps][post]. Requires version + 1.24 or later. [post]: https://docs.docker.com/install/linux/linux-postinstall/ diff --git a/src/docker.rs b/src/docker.rs index 1f5ab5805..0d2fcd682 100644 --- a/src/docker.rs +++ b/src/docker.rs @@ -17,8 +17,6 @@ const DOCKER: &str = "docker"; pub fn docker_command(container_engine: &str, subcommand: &str) -> Command { let mut docker = Command::new(container_engine); docker.arg(subcommand); - - // We always add the `---userns host` flag for compatibility with Podman. docker.args(&["--userns", "host"]); docker } diff --git a/src/main.rs b/src/main.rs index fe0d8ab7a..555ee5598 100644 --- a/src/main.rs +++ b/src/main.rs @@ -329,7 +329,7 @@ impl Toml { } } - /// Returns the `target.{}.container_engine` part of `Cross.toml` + /// Returns the `target.{}.container_engine` part of `Cross.toml` pub fn container_engine(&self, target: &Target) -> Result> { let triple = target.triple();