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

Update the docker file for SGX SDK 2.15.1

Browse Source
This commit is contained in:
zongmin.gu 2021-12-02 16:19:35 +08:00 committed by Zongmin.Gu
parent 8fbb9b4796
commit 39f268891e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exec/rust-toolchain
View File

@ -1 +1 @@
nightly-2020-10-25 nightly-2021-09-13

6
tools/docker/Dockerfile.centos8.2
View File

@ -66,7 +66,7 @@ RUN wget http://www.etallen.com/cpuid/cpuid-20200211.x86_64.tar.gz && \
# Install Rust # Install Rust
ENV PATH="/root/.cargo/bin:$PATH" ENV PATH="/root/.cargo/bin:$PATH"
ENV OCCLUM_RUST_VERSION=nightly-2020-10-25 ENV OCCLUM_RUST_VERSION=nightly-2021-09-13
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 && \
rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \ rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \
@ -75,7 +75,7 @@ RUN curl https://sh.rustup.rs -sSf | \
# Install SGX PSW # Install SGX PSW
WORKDIR /tmp WORKDIR /tmp
RUN echo "ca_directory=/etc/ssl/certs" >> /etc/wgetrc && \ RUN echo "ca_directory=/etc/ssl/certs" >> /etc/wgetrc && \
wget https://download.01.org/intel-sgx/sgx-linux/2.14/distro/centos8.2-server/sgx_rpm_local_repo.tgz && \ wget https://download.01.org/intel-sgx/sgx-linux/2.15.1/distro/centos8.2-server/sgx_rpm_local_repo.tgz && \
tar -xvf sgx_rpm_local_repo.tgz && \ tar -xvf sgx_rpm_local_repo.tgz && \
rm sgx_rpm_local_repo.tgz && \ rm sgx_rpm_local_repo.tgz && \
cd /tmp/sgx_rpm_local_repo && \ cd /tmp/sgx_rpm_local_repo && \
@ -105,7 +105,7 @@ RUN echo "ca_directory=/etc/ssl/certs" >> /etc/wgetrc && \
# Install SGX SDK # Install SGX SDK
WORKDIR /tmp WORKDIR /tmp
RUN git clone -b sgx_2.14_for_occlum https://github.com/occlum/linux-sgx && \ RUN git clone -b sgx_2.15.1_for_occlum https://github.com/occlum/linux-sgx && \
cd linux-sgx && \ cd linux-sgx && \
make preparation && \ make preparation && \
./compile_and_install.sh no_mitigation USE_OPT_LIBS=3 && \ ./compile_and_install.sh no_mitigation USE_OPT_LIBS=3 && \

8
tools/docker/Dockerfile.ubuntu18.04
View File

@ -78,15 +78,15 @@ RUN wget http://www.etallen.com/cpuid/cpuid-20200211.x86_64.tar.gz && \
# Install Rust # Install Rust
ENV PATH="/root/.cargo/bin:$PATH" ENV PATH="/root/.cargo/bin:$PATH"
ENV OCCLUM_RUST_VERSION=nightly-2020-10-25 ENV OCCLUM_RUST_VERSION=nightly-2021-09-13
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 && \
rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \ rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \
cargo -V cargo -V
# Install SGX PSW # Install SGX PSW
ARG PSW_VERSION=2.14.100.2 ARG PSW_VERSION=2.15.101.1
ARG DCAP_VERSION=1.11.100.2 ARG DCAP_VERSION=1.12.101.1
RUN apt-get update && aptitude install -y \ RUN apt-get update && aptitude install -y \
libsgx-launch-dev=$PSW_VERSION-bionic1 \ libsgx-launch-dev=$PSW_VERSION-bionic1 \
libsgx-epid-dev=$PSW_VERSION-bionic1 \ libsgx-epid-dev=$PSW_VERSION-bionic1 \
@ -121,7 +121,7 @@ RUN apt-get update && aptitude install -y \
# Install SGX SDK # Install SGX SDK
WORKDIR /tmp WORKDIR /tmp
RUN git clone -b sgx_2.14_for_occlum https://github.com/occlum/linux-sgx && \ RUN git clone -b sgx_2.15.1_for_occlum https://github.com/occlum/linux-sgx && \
mkdir /etc/init && \ mkdir /etc/init && \
cd linux-sgx && \ cd linux-sgx && \
make preparation && \ make preparation && \