Skip to content

Commit a59ec65

Browse files
shaojunwangroot
authored andcommitted
Fix docker build issue about sgx sdk version and psw/dcap version
1 parent c1f8a7e commit a59ec65

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

test/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Setting PCCS_URL for SGX Remote Attestation.
2121
# PCCS_URL should be changed according to ECS location.
2222
# PCCS_URL=https://sgx-dcap-server.cn-hongkong.aliyuncs.com/sgx/certification/v3/
23-
echo "PCCS_URL=https://sgx-dcap-server.cn-beijing.aliyuncs.com/sgx/certification/v3/" > /etc/sgx_default_qcnl.conf
23+
echo "PCCS_URL=https://sgx-dcap-server.cn-hongkong.aliyuncs.com/sgx/certification/v3/" > /etc/sgx_default_qcnl.conf
2424
echo "USE_SECURE_CERT=TRUE" >> /etc/sgx_default_qcnl.conf
2525

2626
# Compile test project.

tools/cicd/dockerfile_base

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ ENV JAVA_HOME="/root/tools/graalvm-ce-java11-22.2.0"
2424
ENV PATH="/opt/occlum/build/bin:/usr/local/occlum/bin:$PATH"
2525
ENV CC=/usr/local/occlum/bin/occlum-gcc
2626

27-
ARG PSW_VERSION=2.17.100.3
28-
ARG DCAP_VERSION=1.14.100.3
27+
ARG PSW_VERSION=2.18.100.3
28+
ARG DCAP_VERSION=1.15.100.3
2929

3030
ADD ["tmpDownloadDir/graalvm-ce-java11-22.2.0.tar.gz", "/root/tools/"]
3131
ADD ["tmpDownloadDir/zlib-1.2.11.tar.gz", "/root/tools/"]
@@ -47,6 +47,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y gdb gnup
4747
libsgx-urts-dbgsym=${PSW_VERSION}-bionic1 \
4848
libsgx-uae-service=${PSW_VERSION}-bionic1 \
4949
libsgx-dcap-quote-verify-dev=${DCAP_VERSION}-bionic1 \
50+
libsgx-dcap-ql=${DCAP_VERSION}-bionic1 \
5051
libsgx-dcap-ql-dev=${DCAP_VERSION}-bionic1 \
5152
libsgx-dcap-default-qpl=${DCAP_VERSION}-bionic1 && \
5253
cd /root/tools/zlib-1.2.11 && ./configure --prefix=/opt/occlum/toolchains/gcc/x86_64-linux-musl && make && make install && \

tools/cicd/teesdk/build_tee_sdk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ rm -rf linux-sgx
2626

2727
git clone https://github.com/intel/linux-sgx.git
2828

29-
pushd linux-sgx && git checkout stdc_ex
29+
pushd linux-sgx && git checkout stdc_ex_1.0
3030

3131
make preparation && cp external/toolset/ubuntu18.04/* /usr/local/bin
3232

0 commit comments

Comments
 (0)