This is an automated email from the ASF dual-hosted git repository. shaojunwang pushed a commit to branch release-v0.1.0 in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-java-tee-sdk.git
commit a59ec656b2d0a40159d11d6f678dc901d3a22492 Author: shaojunwang <[email protected]> AuthorDate: Thu Dec 8 11:55:27 2022 +0800 Fix docker build issue about sgx sdk version and psw/dcap version --- test/run.sh | 2 +- tools/cicd/dockerfile_base | 5 +++-- tools/cicd/teesdk/build_tee_sdk.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/run.sh b/test/run.sh index 6b827b1..ea8a404 100755 --- a/test/run.sh +++ b/test/run.sh @@ -20,7 +20,7 @@ # Setting PCCS_URL for SGX Remote Attestation. # PCCS_URL should be changed according to ECS location. # PCCS_URL=https://sgx-dcap-server.cn-hongkong.aliyuncs.com/sgx/certification/v3/ -echo "PCCS_URL=https://sgx-dcap-server.cn-beijing.aliyuncs.com/sgx/certification/v3/"; > /etc/sgx_default_qcnl.conf +echo "PCCS_URL=https://sgx-dcap-server.cn-hongkong.aliyuncs.com/sgx/certification/v3/"; > /etc/sgx_default_qcnl.conf echo "USE_SECURE_CERT=TRUE" >> /etc/sgx_default_qcnl.conf # Compile test project. diff --git a/tools/cicd/dockerfile_base b/tools/cicd/dockerfile_base index 1b9fd0a..578edfe 100644 --- a/tools/cicd/dockerfile_base +++ b/tools/cicd/dockerfile_base @@ -24,8 +24,8 @@ ENV JAVA_HOME="/root/tools/graalvm-ce-java11-22.2.0" ENV PATH="/opt/occlum/build/bin:/usr/local/occlum/bin:$PATH" ENV CC=/usr/local/occlum/bin/occlum-gcc -ARG PSW_VERSION=2.17.100.3 -ARG DCAP_VERSION=1.14.100.3 +ARG PSW_VERSION=2.18.100.3 +ARG DCAP_VERSION=1.15.100.3 ADD ["tmpDownloadDir/graalvm-ce-java11-22.2.0.tar.gz", "/root/tools/"] 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 libsgx-urts-dbgsym=${PSW_VERSION}-bionic1 \ libsgx-uae-service=${PSW_VERSION}-bionic1 \ libsgx-dcap-quote-verify-dev=${DCAP_VERSION}-bionic1 \ + libsgx-dcap-ql=${DCAP_VERSION}-bionic1 \ libsgx-dcap-ql-dev=${DCAP_VERSION}-bionic1 \ libsgx-dcap-default-qpl=${DCAP_VERSION}-bionic1 && \ cd /root/tools/zlib-1.2.11 && ./configure --prefix=/opt/occlum/toolchains/gcc/x86_64-linux-musl && make && make install && \ diff --git a/tools/cicd/teesdk/build_tee_sdk.sh b/tools/cicd/teesdk/build_tee_sdk.sh index a6d0c7a..d7c44cc 100755 --- a/tools/cicd/teesdk/build_tee_sdk.sh +++ b/tools/cicd/teesdk/build_tee_sdk.sh @@ -26,7 +26,7 @@ rm -rf linux-sgx git clone https://github.com/intel/linux-sgx.git -pushd linux-sgx && git checkout stdc_ex +pushd linux-sgx && git checkout stdc_ex_1.0 make preparation && cp external/toolset/ubuntu18.04/* /usr/local/bin --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
