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

Update Intel SGX SDK version to 2.13.3

Browse Source
This commit is contained in:
Hui, Chunyang 2021-06-23 03:30:39 +00:00 committed by Zongmin.Gu
parent ea7b7b9fcf
commit 2217cf83b9
5 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/package_repo_setup_and_test.yml vendored
View File

@ -130,7 +130,7 @@ jobs:
run: docker run -itd --name=centos centos:centos8.2.2004 run: docker run -itd --name=centos centos:centos8.2.2004
- name: Install sgx dependencies - name: Install sgx dependencies
run: docker exec centos bash -c "yum install -y wget yum-utils make jq gdb; cd /root && wget https://download.01.org/intel-sgx/sgx-linux/2.13/distro/centos8.2-server/sgx_rpm_local_repo.tgz; run: docker exec centos bash -c "yum install -y wget yum-utils make jq gdb; cd /root && wget https://download.01.org/intel-sgx/sgx-linux/2.13.3/distro/centos8.2-server/sgx_rpm_local_repo.tgz;
tar -xvzf sgx_rpm_local_repo.tgz; yum-config-manager --add-repo file:///root/sgx_rpm_local_repo; yum --nogpgcheck install -y libsgx-dcap-ql libsgx-epid libsgx-urts; tar -xvzf sgx_rpm_local_repo.tgz; yum-config-manager --add-repo file:///root/sgx_rpm_local_repo; yum --nogpgcheck install -y libsgx-dcap-ql libsgx-epid libsgx-urts;
yum --nogpgcheck install -y libsgx-quote-ex; rpm -i /root/sgx_rpm_local_repo/libsgx-uae-service-*.rpm || true" yum --nogpgcheck install -y libsgx-quote-ex; rpm -i /root/sgx_rpm_local_repo/libsgx-uae-service-*.rpm || true"

2
docs/install_occlum_packages.md
View File

@ -113,6 +113,6 @@ The matrix below shows the version compatability since Occlum `0.16.0`. Please c
| 0.19.1 | 2.11 | 18.04 | 8.1 | | 0.19.1 | 2.11 | 18.04 | 8.1 |
| 0.20.0 | 2.11 | 18.04 | 8.1 | | 0.20.0 | 2.11 | 18.04 | 8.1 |
| 0.21.0 | 2.13 | 18.04 | 8.2 | | 0.21.0 | 2.13 | 18.04 | 8.2 |
| 0.23.1 | 2.13.3 | 18.04 | 8.2 |
For more information about the packages, please checkout [here](../tools/installer/README.md). For more information about the packages, please checkout [here](../tools/installer/README.md).

2
tools/docker/Dockerfile.aliyunlinux
View File

@ -117,7 +117,7 @@ RUN wget https://mirrors.openanolis.org/inclavare-containers/alinux2/sgx_rpm_loc
# Install SGX SDK # Install SGX SDK
WORKDIR /tmp WORKDIR /tmp
RUN git clone -b sgx_2.13_for_occlum https://github.com/occlum/linux-sgx && \ RUN git clone -b sgx_2.13.3_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=2 && \ ./compile_and_install.sh no_mitigation USE_OPT_LIBS=2 && \

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

@ -104,10 +104,10 @@ ENV PATH="/opt/occlum/toolchains/jvm/bin:$PATH"
# 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.13/distro/centos8.2-server/sgx_rpm_local_repo.tgz && \ wget https://download.01.org/intel-sgx/sgx-linux/2.13.3/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 && \
wget https://download.01.org/intel-sgx/sgx-dcap/1.10/linux/distro/centos8.2-server/sgx_rpm_local_repo.tgz && \ wget https://download.01.org/intel-sgx/sgx-dcap/1.10.3/linux/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 && \
@ -137,7 +137,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.13_for_occlum https://github.com/occlum/linux-sgx && \ RUN git clone -b sgx_2.13.3_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=2 && \ ./compile_and_install.sh no_mitigation USE_OPT_LIBS=2 && \

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

@ -117,33 +117,35 @@ RUN cd java && ./install_dragonwell.sh && rm -rf /tmp/java
ENV PATH="/opt/occlum/toolchains/jvm/bin:$PATH" ENV PATH="/opt/occlum/toolchains/jvm/bin:$PATH"
# Install SGX PSW # Install SGX PSW
ARG PSW_VERSION=2.13.103.1
ARG DCAP_VERSION=1.10.103.1
RUN apt-get update && aptitude install -y \ RUN apt-get update && aptitude install -y \
libsgx-launch-dev=2.13.100.4-bionic1 \ libsgx-launch-dev=$PSW_VERSION-bionic1 \
libsgx-epid-dev=2.13.100.4-bionic1 \ libsgx-epid-dev=$PSW_VERSION-bionic1 \
libsgx-quote-ex-dev=2.13.100.4-bionic1 \ libsgx-quote-ex-dev=$PSW_VERSION-bionic1 \
libsgx-urts=2.13.100.4-bionic1 \ libsgx-urts=$PSW_VERSION-bionic1 \
libsgx-enclave-common=2.13.100.4-bionic1 \ libsgx-enclave-common=$PSW_VERSION-bionic1 \
libsgx-uae-service=2.13.100.4-bionic1 \ libsgx-uae-service=$PSW_VERSION-bionic1 \
libsgx-ae-epid=2.13.100.4-bionic1 \ libsgx-ae-epid=$PSW_VERSION-bionic1 \
libsgx-ae-le=2.13.100.4-bionic1 \ libsgx-ae-le=$PSW_VERSION-bionic1 \
libsgx-ae-pce=2.13.100.4-bionic1 \ libsgx-ae-pce=$PSW_VERSION-bionic1 \
libsgx-aesm-launch-plugin=2.13.100.4-bionic1 \ libsgx-aesm-launch-plugin=$PSW_VERSION-bionic1 \
sgx-aesm-service=2.13.100.4-bionic1 \ sgx-aesm-service=$PSW_VERSION-bionic1 \
libsgx-aesm-launch-plugin=2.13.100.4-bionic1 \ libsgx-aesm-launch-plugin=$PSW_VERSION-bionic1 \
libsgx-aesm-pce-plugin=2.13.100.4-bionic1 \ libsgx-aesm-pce-plugin=$PSW_VERSION-bionic1 \
libsgx-aesm-ecdsa-plugin=2.13.100.4-bionic1 \ libsgx-aesm-ecdsa-plugin=$PSW_VERSION-bionic1 \
libsgx-aesm-epid-plugin=2.13.100.4-bionic1 \ libsgx-aesm-epid-plugin=$PSW_VERSION-bionic1 \
libsgx-aesm-quote-ex-plugin=2.13.100.4-bionic1 \ libsgx-aesm-quote-ex-plugin=$PSW_VERSION-bionic1 \
libsgx-dcap-quote-verify=1.10.100.4-bionic1 \ libsgx-dcap-quote-verify=$DCAP_VERSION-bionic1 \
libsgx-dcap-quote-verify-dev=1.10.100.4-bionic1 \ libsgx-dcap-quote-verify-dev=$DCAP_VERSION-bionic1 \
libsgx-dcap-ql=1.10.100.4-bionic1 \ libsgx-dcap-ql=$DCAP_VERSION-bionic1 \
libsgx-dcap-ql-dev=1.10.100.4-bionic1 \ libsgx-dcap-ql-dev=$DCAP_VERSION-bionic1 \
libsgx-epid=2.13.100.4-bionic1 \ libsgx-epid=$PSW_VERSION-bionic1 \
libsgx-quote-ex=2.13.100.4-bionic1 \ libsgx-quote-ex=$PSW_VERSION-bionic1 \
libsgx-pce-logic=1.10.100.4-bionic1 \ libsgx-pce-logic=$DCAP_VERSION-bionic1 \
libsgx-qe3-logic=1.10.100.4-bionic1 \ libsgx-qe3-logic=$DCAP_VERSION-bionic1 \
libsgx-launch=2.13.100.4-bionic1 \ libsgx-launch=$PSW_VERSION-bionic1 \
libsgx-dcap-default-qpl=1.10.100.4-bionic1 \ libsgx-dcap-default-qpl=$DCAP_VERSION-bionic1 \
&& \ && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
@ -151,7 +153,7 @@ RUN apt-get update && aptitude install -y \
# Install SGX SDK # Install SGX SDK
WORKDIR /tmp WORKDIR /tmp
RUN git clone -b sgx_2.13_for_occlum https://github.com/occlum/linux-sgx && \ RUN git clone -b sgx_2.13.3_for_occlum https://github.com/occlum/linux-sgx && \
mkdir /etc/init && \ mkdir /etc/init && \
cd linux-sgx && \ cd linux-sgx && \
make preparation && \ make preparation && \