[DOCKER] Fix CI script (#1826)

docker/Dockerfile.ci_cpu

@@ -23,6 +23,13 @@ RUN bash /install/ubuntu_install_redis.sh
 COPY install/ubuntu_install_golang.sh /install/ubuntu_install_golang.sh
 RUN bash /install/ubuntu_install_golang.sh
 
+# Rust env
+COPY install/ubuntu_install_rust.sh /install/ubuntu_install_rust.sh
+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 PATH $PATH:/root/.cargo/bin

docker/Dockerfile.demo_opencl

@@ -13,14 +13,14 @@ RUN apt-get update
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
 RUN echo "Installing utility libraries"
-RUN apt-get install -y apt-utils
+RUN apt-get install -y apt-utils sudo
 RUN apt-get install -y cmake g++ llvm
 RUN apt-get install -y git
 # make wget unzip libtinfo-dev libz-dev libcurl4-openssl-dev
 RUN apt-get install -y libopenblas-dev
 
 # RUN echo "Installing gtest"
-# RUN apt-get install -y libgtest-dev 
+# RUN apt-get install -y libgtest-dev
 # RUN cd /usr/src/gtest && cmake CMakeLists.txt && make && cp *.a /usr/lib
 
 RUN echo "Installing Python"
@@ -35,7 +35,7 @@ RUN apt-get install -y libviennacl-dev mesa-opencl-icd ocl-icd-opencl-dev clinfo
 RUN apt-get install -y libclblas-dev libclfft-dev libclsparse-dev
 
 RUN echo "Installing OpenGL libraries"
-RUN apt-get install -y libcogl-dev libegl1 libgles1 libglfw3-dev 
+RUN apt-get install -y libcogl-dev libegl1 libgles1 libglfw3-dev
 # libglew-dev
 
 RUN echo "Upgrading dependencies"

docker/install/ubuntu_install_rust.sh

+apt-get update && apt-get install -y --no-install-recommends --force-yes curl
+
+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 component add rust-src
+cargo install rustfmt-nightly --force
+cargo install xargo

docker/install/ubuntu_install_sgx.sh

-apt-get update -qq && apt-get install -qq \
-    # for SGX SDK
+apt-get update && apt-get install -y --no-install-recommends --force-yes \
     build-essential git cmake \
     wget python pkg-config software-properties-common \
-    autoconf automake libtool ocaml ocamlbuild \
-    # for SGX PSW
-    libssl-dev libcurl4-openssl-dev
+    autoconf automake libtool ocaml \
+    libssl-dev libcurl4-openssl-dev curl
 
 git clone https://github.com/intel/linux-sgx.git
 cd linux-sgx
@@ -19,10 +17,3 @@ git clone https://github.com/baidu/rust-sgx-sdk.git /opt/rust-sgx-sdk
 cd /opt/rust-sgx-sdk
 git checkout bdd75ca05f66d1f5df637182ec335970f769b03a
 cd -
-
-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
-rustup component add rust-src
-cargo install rustfmt-nightly --force
-cargo install xargo