[Rust] Update rust install in dockerfile (apache#1855)

* Update rust docker * minor edit for consistency
FrozenGene · Oct 6, 2018 · a7e8046 · a7e8046
1 parent 01b9c9e
commit a7e8046
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu
@@ -30,6 +30,7 @@ RUN bash /install/ubuntu_install_rust.sh
 # SGX deps
 COPY install/ubuntu_install_sgx.sh /install/ubuntu_install_sgx.sh
 RUN bash /install/ubuntu_install_sgx.sh
+ENV LD_LIBRARY_PATH /opt/sgxsdk/lib64:${LD_LIBRARY_PATH}
 
 
 ENV PATH $PATH:/root/.cargo/bin:/usr/lib/go-1.10/bin
diff --git a/docker/install/ubuntu_install_rust.sh b/docker/install/ubuntu_install_rust.sh
@@ -4,6 +4,7 @@ curl -sSo rustup.sh 'https://sh.rustup.rs'
 # rustc nightly-2018-08-25 is the version supported by the above version of rust-sgx-sdk
 bash rustup.sh -y --no-modify-path --default-toolchain nightly-2018-08-25
 . $HOME/.cargo/env
+rustup toolchain add nightly
 rustup component add rust-src
-cargo install rustfmt-nightly --force
-cargo install xargo
+cargo +nightly install rustfmt-nightly --version 0.99.5 --force
+cargo +nightly install xargo