From ef06b7e607bcb7b27bebd33089ef7b27096d2e15 Mon Sep 17 00:00:00 2001 From: Valentyn Faychuk Date: Wed, 22 Jan 2025 03:48:37 +0200 Subject: [PATCH] add utilities library to docker image Signed-off-by: Valentyn Faychuk --- tools/docker/Dockerfile.aliyunlinux3 | 2 +- tools/docker/Dockerfile.anolis8.8 | 6 +++++- tools/docker/Dockerfile.ubuntu20.04 | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/docker/Dockerfile.aliyunlinux3 b/tools/docker/Dockerfile.aliyunlinux3 index 62147c23..8f306e17 100644 --- a/tools/docker/Dockerfile.aliyunlinux3 +++ b/tools/docker/Dockerfile.aliyunlinux3 @@ -125,7 +125,7 @@ RUN wget http://www.etallen.com/cpuid/cpuid-20200211.x86_64.tar.gz && \ # Download the Occlum source ARG OCCLUM_BRANCH WORKDIR /root -RUN git clone -b $OCCLUM_BRANCH https://github.com/occlum/occlum && \ +RUN git clone -b $OCCLUM_BRANCH https://gitea.detee.cloud/general/occlum && \ cp -r /root/occlum/tools/toolchains/* /tmp/ && mkdir -p /opt/occlum/ && \ cp /root/occlum/tools/docker/start_aesm.sh /opt/occlum/ diff --git a/tools/docker/Dockerfile.anolis8.8 b/tools/docker/Dockerfile.anolis8.8 index b290d400..c2d172e0 100644 --- a/tools/docker/Dockerfile.anolis8.8 +++ b/tools/docker/Dockerfile.anolis8.8 @@ -129,7 +129,7 @@ RUN wget http://www.etallen.com/cpuid/cpuid-20200211.x86_64.tar.gz && \ # Download the Occlum source ARG OCCLUM_BRANCH WORKDIR /root -RUN git clone -b $OCCLUM_BRANCH https://github.com/occlum/occlum && \ +RUN git clone -b $OCCLUM_BRANCH https://gitea.detee.cloud/general/occlum && \ cd /root/occlum && git submodule update --init && \ mkdir -p /opt/occlum/ && \ cp /root/occlum/tools/docker/start_aesm.sh /opt/occlum/ @@ -181,6 +181,10 @@ COPY --from=alpine /etc/ssl/certs/java/cacerts $JDK8_PATH/jre/lib/security/cacer WORKDIR /root/occlum/tools/toolchains RUN cd dcap_lib && ./build.sh && cd .. && rm -rf dcap_lib +# Install utilities library +WORKDIR /root/occlum/tools/toolchains +RUN cd utils_lib && ./build.sh && cd .. && rm -rf utils_lib + # Install AECS Client library WORKDIR /root/occlum/tools/toolchains RUN cd aecs_client && ./build.sh && cd .. && rm -rf aecs_client diff --git a/tools/docker/Dockerfile.ubuntu20.04 b/tools/docker/Dockerfile.ubuntu20.04 index 6b97a097..9bb835c3 100644 --- a/tools/docker/Dockerfile.ubuntu20.04 +++ b/tools/docker/Dockerfile.ubuntu20.04 @@ -136,7 +136,7 @@ RUN git clone -b sgx_2.20_for_occlum https://github.com/occlum/linux-sgx && \ # Download the Occlum source ARG OCCLUM_BRANCH WORKDIR /root -RUN git clone -b $OCCLUM_BRANCH https://github.com/occlum/occlum && \ +RUN git clone -b $OCCLUM_BRANCH https://gitea.detee.cloud/general/occlum && \ cd /root/occlum && git submodule update --init && \ mkdir -p /opt/occlum/ && \ cp /root/occlum/tools/docker/start_aesm.sh /opt/occlum/ @@ -188,6 +188,10 @@ COPY --from=alpine /etc/ssl/certs/java/cacerts $JDK8_PATH/jre/lib/security/cacer WORKDIR /root/occlum/tools/toolchains RUN cd dcap_lib && ./build.sh && cd .. && rm -rf dcap_lib +# Install utilities library +WORKDIR /root/occlum/tools/toolchains +RUN cd utils_lib && ./build.sh && cd .. && rm -rf utils_lib + # Install AECS Client library WORKDIR /root/occlum/tools/toolchains RUN cd aecs_client && ./build.sh && cd .. && rm -rf aecs_client