Auto merge of #559 - pietroalbini:docker-server, r=pietroalbini

Fix the Docker image to also work for running the server

Author: bors

Dockerfile

@@ -5,7 +5,7 @@
 #  Build image  #
 #################
 
-FROM ubuntu:bionic AS build
+FROM ubuntu:focal AS build
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     ca-certificates \
@@ -50,18 +50,23 @@ RUN find /source -name "*.rs" -exec touch {} \; && cargo build --release
 #  Output image  #
 ##################
 
-FROM ubuntu:bionic AS binary
+FROM ubuntu:focal AS binary
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     docker.io \
     build-essential \
     pkg-config \
     libssl-dev \
-    ca-certificates
+    ca-certificates \
+    tini
 
 RUN mkdir /workspace
 ENV CRATER_WORK_DIR=/workspace
 ENV CRATER_INSIDE_DOCKER=1
 
+RUN mkdir /crater
+COPY config.toml /crater/config.toml
+WORKDIR /crater
+
 COPY --from=build /source/target/release/crater /usr/local/bin/
-ENTRYPOINT ["crater"]
+ENTRYPOINT ["tini", "--", "crater"]

config.toml

@@ -100,7 +100,6 @@ rustlearn = { skip-tests = true } # non-deterministic
 s_app_dir = { skip-tests = true } # flaky tests
 sacn = { skip-tests = true } # Tests just fail if RUST_TEST_THREADS > 1 -author
 sbrsk = { skip-tests = true } # flaky tests
-signatory-ring = { skip-tests = true } # flaky tests
 silk = { slow = true } # tests slow to run
 simd = { broken = true } # missing feature
 simple-munin-plugin = { skip-tests = true } # flaky test

src/cli.rs

@@ -23,6 +23,7 @@ use crater::toolchain::Toolchain;
 use failure::{bail, Error, Fallible};
 use rustwide::{cmd::SandboxImage, Workspace, WorkspaceBuilder};
 use std::collections::HashSet;
+use std::net::SocketAddr;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::Duration;
@@ -265,7 +266,15 @@ pub enum Crater {
     },
 
     #[structopt(name = "server")]
-    Server,
+    Server {
+        #[structopt(
+            name = "bind",
+            long = "bind",
+            short = "b",
+            help = "The address and port to bind to."
+        )]
+        bind: Option<SocketAddr>,
+    },
 
     #[structopt(name = "agent")]
     Agent {
@@ -589,9 +598,12 @@ impl Crater {
                     bail!("missing experiment: {}", ex.0);
                 }
             }
-            Crater::Server => {
+            Crater::Server { bind } => {
                 let config = Config::load()?;
-                server::run(config)?;
+                server::run(
+                    config,
+                    bind.unwrap_or_else(|| ([127, 0, 0, 1], 8000).into()),
+                )?;
             }
             Crater::Agent {
                 ref url,

src/config.rs

@@ -242,6 +242,7 @@ impl Config {
 }
 
 #[cfg(test)]
+#[allow(clippy::trivial_regex)]
 impl Default for Config {
     fn default() -> Self {
         Config {

src/report/s3.rs

@@ -76,7 +76,7 @@ pub fn get_client_for_bucket(bucket: &str) -> Fallible<Box<dyn S3>> {
         .sync()
         .context(S3Error::UnknownBucketRegion)?;
     let region = match response.location_constraint.as_ref() {
-        Some(region) if region == "" => Region::UsEast1,
+        Some(region) if region.is_empty() => Region::UsEast1,
         Some(region) => Region::from_str(region).context(S3Error::UnknownBucketRegion)?,
         None => return Err(S3Error::UnknownBucketRegion.into()),
     };

src/server/mod.rs

@@ -20,6 +20,7 @@ use crate::server::tokens::Tokens;
 use http::{self, header::HeaderValue, Response};
 use hyper::Body;
 use metrics::Metrics;
+use std::net::SocketAddr;
 use std::sync::{Arc, Mutex};
 use warp::{self, Filter};
 
@@ -49,7 +50,7 @@ pub struct Data {
     pub metrics: Metrics,
 }
 
-pub fn run(config: Config) -> Fallible<()> {
+pub fn run(config: Config, bind: SocketAddr) -> Fallible<()> {
     let db = Database::open()?;
     let tokens = tokens::Tokens::load()?;
     let github = GitHubApi::new(&tokens);
@@ -77,7 +78,7 @@ pub fn run(config: Config) -> Fallible<()> {
     data.reports_worker.spawn(data.clone());
     cronjobs::spawn(data.clone());
 
-    info!("running server...");
+    info!("running server on {}...", bind);
 
     let data = Arc::new(data);
 
@@ -100,7 +101,7 @@ pub fn run(config: Config) -> Fallible<()> {
             resp
         });
 
-    warp::serve(routes).run(([127, 0, 0, 1], 8000));
+    warp::serve(routes).run(bind);
 
     Ok(())
 }

src/server/routes/webhooks/mod.rs

@@ -83,7 +83,7 @@ fn process_command(
         }
 
         let command = line[line.find(' ').unwrap()..].trim();
-        if command == "" {
+        if command.is_empty() {
             continue;
         }