From f28a864fd9dc5adaec0c65f4737560556861859d Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 30 Oct 2018 09:16:30 -0700 Subject: kokoro: update to Rust 1.30.0 Also add g++ to the apt package list, since minijail now requires it. BUG=None TEST=Rebuild Docker container and run tests Change-Id: I3d5cee0fa626e840037ae83537bdf891b4489a49 Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/1307815 Commit-Ready: ChromeOS CL Exonerator Bot Reviewed-by: Zach Reizner --- kokoro/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kokoro/Dockerfile b/kokoro/Dockerfile index 742bf3c..e43bbfd 100644 --- a/kokoro/Dockerfile +++ b/kokoro/Dockerfile @@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y \ automake \ curl \ gcc \ + g++ \ git \ libcap-dev \ libdrm-dev \ @@ -30,12 +31,12 @@ RUN apt-get update && apt-get install -y \ ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.29.0 + RUST_VERSION=1.30.0 # Debian usually has an old rust version in the repository. Instead of using that, we use rustup to # pull in a toolchain versions of our choosing. -RUN curl -LO "https://static.rust-lang.org/rustup/archive/1.13.0/x86_64-unknown-linux-gnu/rustup-init" \ - && echo "f69dafcca62fe70d7882113e21bb96a2cbdf4fc4636d25337d6de9191bdec8da *rustup-init" | sha256sum -c - \ +RUN curl -LO "https://static.rust-lang.org/rustup/archive/1.14.0/x86_64-unknown-linux-gnu/rustup-init" \ + && echo "0077ff9c19f722e2be202698c037413099e1188c0c233c12a2297bf18e9ff6e7 *rustup-init" | sha256sum -c - \ && chmod +x rustup-init \ && ./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION \ && rustup component add rustfmt-preview \ -- cgit 1.4.1