diff options
| author | Daniel Verkamp <dverkamp@chromium.org> | 2018-10-30 09:16:30 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-10-31 12:42:25 -0700 |
| commit | f28a864fd9dc5adaec0c65f4737560556861859d (patch) | |
| tree | 08e803161a99151cb73f0260daf7dfa6a176f7ec /kokoro | |
| parent | 49dd2e219deeb685980d3b27545c09d43cc157be (diff) | |
| download | crosvm-f28a864fd9dc5adaec0c65f4737560556861859d.tar crosvm-f28a864fd9dc5adaec0c65f4737560556861859d.tar.gz crosvm-f28a864fd9dc5adaec0c65f4737560556861859d.tar.bz2 crosvm-f28a864fd9dc5adaec0c65f4737560556861859d.tar.lz crosvm-f28a864fd9dc5adaec0c65f4737560556861859d.tar.xz crosvm-f28a864fd9dc5adaec0c65f4737560556861859d.tar.zst crosvm-f28a864fd9dc5adaec0c65f4737560556861859d.zip | |
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 <dverkamp@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1307815 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'kokoro')
| -rw-r--r-- | kokoro/Dockerfile | 7 |
1 files 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 \ |