From a270eb4af1071cd443e7cabacbf242233e179185 Mon Sep 17 00:00:00 2001 From: "Zheng, Qi" Date: Wed, 9 Feb 2022 14:32:50 +0800 Subject: [PATCH] Build and install dcap lib when make submodule This reverts commit 4c99c875e7bddec85431ddb883adea58b7e530cd. --- Makefile | 3 +++ tools/docker/Dockerfile.aliyunlinux3 | 4 ---- tools/docker/Dockerfile.centos8.2 | 4 ---- tools/docker/Dockerfile.ubuntu18.04 | 4 ---- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 4f4be165..a0991229 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,9 @@ submodule: githooks @cp deps/sefs/sefs-cli/lib/libsefs-cli.signed.so build/lib @cp deps/sefs/sefs-cli/enclave/Enclave.config.xml build/sefs-cli.Enclave.xml + @# Build and install Occlum dcap lib + @cd tools/toolchains/dcap_lib && ./build.sh + src: @$(MAKE) --no-print-directory -C src diff --git a/tools/docker/Dockerfile.aliyunlinux3 b/tools/docker/Dockerfile.aliyunlinux3 index aa750815..46526427 100644 --- a/tools/docker/Dockerfile.aliyunlinux3 +++ b/tools/docker/Dockerfile.aliyunlinux3 @@ -179,10 +179,6 @@ COPY --from=alpine /usr/lib/jvm/java-1.8-openjdk $JDK8_PATH RUN rm $JDK8_PATH/jre/lib/security/cacerts COPY --from=alpine /etc/ssl/certs/java/cacerts $JDK8_PATH/jre/lib/security/cacerts -# Install Occlum dcap lib -WORKDIR /root/occlum/tools/toolchains -RUN cd dcap_lib && ./build.sh - ENV LD_LIBRARY_PATH="/opt/intel/sgxpsw/aesm:/usr/lib64/:/usr/local/lib:/opt/intel/sgxsdk/sdk_libs:/usr/lib:$LD_LIBRARY_PATH" # Build and install Occlum WORKDIR /root diff --git a/tools/docker/Dockerfile.centos8.2 b/tools/docker/Dockerfile.centos8.2 index bbe4c8b9..13de2e8e 100644 --- a/tools/docker/Dockerfile.centos8.2 +++ b/tools/docker/Dockerfile.centos8.2 @@ -162,10 +162,6 @@ COPY --from=alpine /usr/lib/jvm/java-1.8-openjdk $JDK8_PATH RUN rm $JDK8_PATH/jre/lib/security/cacerts COPY --from=alpine /etc/ssl/certs/java/cacerts $JDK8_PATH/jre/lib/security/cacerts -# Install Occlum dcap lib -WORKDIR /root/occlum/tools/toolchains -RUN cd dcap_lib && ./build.sh - # Build and install Occlum WORKDIR /root RUN cd occlum && \ diff --git a/tools/docker/Dockerfile.ubuntu18.04 b/tools/docker/Dockerfile.ubuntu18.04 index 810f9070..c9601f12 100644 --- a/tools/docker/Dockerfile.ubuntu18.04 +++ b/tools/docker/Dockerfile.ubuntu18.04 @@ -179,10 +179,6 @@ COPY --from=alpine /usr/lib/jvm/java-1.8-openjdk $JDK8_PATH RUN rm $JDK8_PATH/jre/lib/security/cacerts COPY --from=alpine /etc/ssl/certs/java/cacerts $JDK8_PATH/jre/lib/security/cacerts -# Install Occlum dcap lib -WORKDIR /root/occlum/tools/toolchains -RUN cd dcap_lib && ./build.sh - WORKDIR /root RUN cd occlum && \ source /opt/intel/sgxsdk/environment && \