Skip to content

Commit

Permalink
Adding required Docker version to README and minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ostrosco committed Nov 13, 2019
1 parent 6c6da37 commit 42f2410
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
2 changes: 0 additions & 2 deletions src/docker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Option<String>> {
let triple = target.triple();

Expand Down

0 comments on commit 42f2410

Please sign in to comment.