From 8f3ff6d86635dd4a817ce143bc7c1ed0d875b6ff Mon Sep 17 00:00:00 2001
From: "Tate, Hongliang Tian" <tate.thl@antfin.com>
Date: Sat, 19 Oct 2019 06:03:50 +0000
Subject: [PATCH] Fix minor bugs in Dockerfile

---
 src/libos/Cargo.lock    |  2 +-
 tools/docker/Dockerfile | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libos/Cargo.lock b/src/libos/Cargo.lock
index 5c15e019..6729fe0b 100644
--- a/src/libos/Cargo.lock
+++ b/src/libos/Cargo.lock
@@ -2,7 +2,7 @@
 # It is not intended for manual editing.
 [[package]]
 name = "Occlum"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_builder 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 54ee0894..5e43d9e2 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -63,12 +63,12 @@ RUN git clone https://github.com/occlum/linux-sgx . && \
 ENV OCCLUM_RUST_VERSION=nightly-2019-01-28
 RUN curl https://sh.rustup.rs -sSf | \
         sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \
-    echo 'source /root/.cargo/env' >> /root/.bashrc && \
     rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git
+ENV PATH="/root/.cargo/bin:$PATH"
 
 # Install Occlum toolchain
-COPY toolchains/gcc /tmp
-WORKDIR /tmp/gcc
+COPY toolchains/gcc/* /tmp/
+WORKDIR /tmp
 RUN ./build.sh
 ENV PATH="/opt/occlum/build/bin:/usr/local/occlum/bin:$PATH"
 
@@ -87,7 +87,7 @@ RUN git clone https://github.com/occlum/occlum && \
 # To do so, we add the script to ~/.bashrc. We cannot use systemd to run AESM
 # as a "real" service since the pid 1 is not systemd in Docker. So we start
 # up AESM service when an user login with an interative shell.
-COPY docker/start_aesm.sh /root
-RUN echo './root/start_aesm.sh' >> /root/.bashrc
+COPY docker/start_aesm.sh /opt/occlum/
+RUN echo '/opt/occlum/start_aesm.sh' >> /root/.bashrc
 
 WORKDIR /root