general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix minor bugs in Dockerfile

Browse Source
This commit is contained in:
Tate, Hongliang Tian 2019-10-19 06:03:50 +00:00
parent f9376ec4ba
commit 8f3ff6d866
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libos/Cargo.lock generated
View File

@ -2,7 +2,7 @@
# It is not intended for manual editing. # It is not intended for manual editing.
[[package]] [[package]]
name = "Occlum" name = "Occlum"
version = "0.5.0" version = "0.6.0"
dependencies = [ dependencies = [
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "derive_builder 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",

10
tools/docker/Dockerfile
View File

@ -63,12 +63,12 @@ RUN git clone https://github.com/occlum/linux-sgx . && \
ENV OCCLUM_RUST_VERSION=nightly-2019-01-28 ENV OCCLUM_RUST_VERSION=nightly-2019-01-28
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \ 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 rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git
ENV PATH="/root/.cargo/bin:$PATH"
# Install Occlum toolchain # Install Occlum toolchain
COPY toolchains/gcc /tmp COPY toolchains/gcc/* /tmp/
WORKDIR /tmp/gcc WORKDIR /tmp
RUN ./build.sh RUN ./build.sh
ENV PATH="/opt/occlum/build/bin:/usr/local/occlum/bin:$PATH" 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 # 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 # 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. # up AESM service when an user login with an interative shell.
COPY docker/start_aesm.sh /root COPY docker/start_aesm.sh /opt/occlum/
RUN echo './root/start_aesm.sh' >> /root/.bashrc RUN echo '/opt/occlum/start_aesm.sh' >> /root/.bashrc
WORKDIR /root WORKDIR /root