From efb6e591e43a29965fbb6b924c4ad0e8ce37164d Mon Sep 17 00:00:00 2001 From: Andre Brisco Date: Sun, 28 Mar 2021 17:55:03 -0700 Subject: [PATCH] Added environment variables to control the UID and GID in the container --- src/docker.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/docker.rs b/src/docker.rs index 2b6412304..02e529a83 100644 --- a/src/docker.rs +++ b/src/docker.rs @@ -151,7 +151,14 @@ pub fn run(target: &Target, // We need to specify the user for Docker, but not for Podman. if let Ok(ce) = get_container_engine() { if ce.ends_with(DOCKER) { - docker.args(&["--user", &format!("{}:{}", id::user(), id::group())]); + docker.args(&[ + "--user", + &format!( + "{}:{}", + env::var("CROSS_CONTAINER_UID").unwrap_or(id::user().to_string()), + env::var("CROSS_CONTAINER_GID").unwrap_or(id::group().to_string()), + ), + ]); } }