Allow use of a smaller environment for local testing

Author: aidanhs

README.md

@@ -48,8 +48,7 @@ of its output is into the `./work` directory, where it maintains its
 own rustup installation, crate mirrors, etc.
 
 ```
-cd docker && docker build . && cd ..    # This takes a while
-cargo run -- prepare-local
+cargo run -- prepare-local --docker-env mini
 cargo run -- define-ex --crate-select=demo stable beta
 cargo run -- prepare-ex
 cargo run -- run

docker/Dockerfile renamed to docker/Dockerfile.full

@@ -0,0 +1,27 @@
+FROM ubuntu:16.04
+
+ENV LAST_UPDATE=2017-05-25
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update
+
+# Tools
+RUN apt-get install -y gcc pkg-config cmake
+
+# Native deps
+RUN apt-get install -y libssl-dev
+
+WORKDIR /source
+
+# Create a crater user that run.sh will map to the value of the host user via
+# the USER_ID environment variable, to make the files the container writes not
+# be owned by root, but by the running host user
+# re https://github.com/docker/docker/issues/7198#issuecomment-158566258
+RUN adduser --no-create-home --disabled-login --gecos "" crater --uid 1000
+
+# Configure the user id, controlled by -e USER_ID, and then
+# runs some command, controlled by -e CMD
+CMD ["bash", "-c", "usermod -u \"$USER_ID\" crater && exec su crater -c \"/run2.sh $CMD\""]
+
+# sets up the environment for $CMD
+COPY run2.sh /run2.sh

docker/Dockerfile.mini

@@ -34,14 +34,17 @@ use std::str::FromStr;
 #[derive(Debug, Clone)]
 pub struct Ex(String);
 
+#[derive(Debug, Clone)]
+pub struct DockerEnv(String);
+
 #[derive(Debug, Clone)]
 pub struct Dest(PathBuf);
 
 pub trait Cmd {
     fn run(&self) -> Result<()>;
 }
 
-struct PrepareLocal;
+struct PrepareLocal(DockerEnv);
 struct DefineEx(Ex, Toolchain, Toolchain, ExMode, ExCrateSelect);
 #[derive(StructOpt)]
 #[structopt(name = "prepare-ex", about = "prepare shared and local data for experiment")]
@@ -91,9 +94,10 @@ struct Serve;
 // Local prep
 impl Cmd for PrepareLocal {
     fn run(&self) -> Result<()> {
+        let docker_env = &(self.0).0;
         let stable_tc = Toolchain::Dist("stable".into());
         stable_tc.prepare()?;
-        docker::build_container()?;
+        docker::build_container(docker_env)?;
         lists::create_all_lists(false)
     }
 }
@@ -278,7 +282,7 @@ pub mod conv {
             cmd(
                 "prepare-local",
                 "acquire toolchains, build containers, build crate lists",
-            ),
+            ).arg(opt("docker-env", "full")),
             // List creation
             cmd("create-lists", "create all the lists of crates"),
             // Master experiment prep
@@ -351,9 +355,13 @@ pub mod conv {
                 .parse::<ExCrateSelect>()
         }
 
+        fn docker_env(m: &ArgMatches) -> DockerEnv {
+            DockerEnv(m.value_of("docker-env").expect("").to_string())
+        }
+
         Ok(match m.subcommand() {
             // Local prep
-            ("prepare-local", _) => Box::new(PrepareLocal),
+            ("prepare-local", Some(m)) => Box::new(PrepareLocal(docker_env(m))),
             ("create-lists", _) => Box::new(CreateLists),
 
             // Master experiment prep

src/cli.rs

@@ -10,8 +10,13 @@ static IMAGE_NAME: &'static str = "crater";
 /// Builds the docker container image, 'crater', what will be used
 /// to isolate builds from each other. This expects the Dockerfile
 /// to exist in the `docker` directory, at runtime.
-pub fn build_container() -> Result<()> {
-    run::run("docker", &["build", "-t", IMAGE_NAME, "docker"], &[])
+pub fn build_container(docker_env: &str) -> Result<()> {
+    let dockerfile = format!("docker/Dockerfile.{}", docker_env);
+    run::run(
+        "docker",
+        &["build", "-f", &dockerfile, "-t", IMAGE_NAME, "docker"],
+        &[],
+    )
 }
 
 #[derive(Copy, Clone)]