From d21bcf245e5dd22df18230c41ef5f7cf2e02fb2f Mon Sep 17 00:00:00 2001 From: "Zheng, Qi" Date: Thu, 2 Dec 2021 10:06:30 +0800 Subject: [PATCH] Install openjdk 8 to occlum toolchain --- tools/docker/Dockerfile.aliyunlinux3 | 7 ++++++- tools/docker/Dockerfile.centos8.2 | 8 +++++++- tools/docker/Dockerfile.ubuntu18.04 | 8 +++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/tools/docker/Dockerfile.aliyunlinux3 b/tools/docker/Dockerfile.aliyunlinux3 index a6d501dc..46526427 100644 --- a/tools/docker/Dockerfile.aliyunlinux3 +++ b/tools/docker/Dockerfile.aliyunlinux3 @@ -1,7 +1,7 @@ FROM alpine:3.11 AS alpine RUN apk update && \ - apk --no-cache add openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + apk --no-cache add openjdk11 openjdk8 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community FROM registry.cn-hangzhou.aliyuncs.com/alinux/alinux3:3.210714.1 @@ -173,6 +173,11 @@ WORKDIR /tmp RUN cd java && ./install_dragonwell.sh && rm -rf /tmp/java ENV PATH="/opt/occlum/toolchains/jvm/bin:$PATH" +# Install OpenJDK 8 +ARG JDK8_PATH=/opt/occlum/toolchains/jvm/java-1.8-openjdk +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 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 diff --git a/tools/docker/Dockerfile.centos8.2 b/tools/docker/Dockerfile.centos8.2 index 46da153a..538a372a 100644 --- a/tools/docker/Dockerfile.centos8.2 +++ b/tools/docker/Dockerfile.centos8.2 @@ -1,7 +1,7 @@ FROM alpine:3.11 AS alpine LABEL maintainer="Qing Li " RUN apk update && \ - apk --no-cache add openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + apk --no-cache add openjdk11 openjdk8 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community FROM centos:8 @@ -156,6 +156,12 @@ WORKDIR /tmp RUN cd java && ./install_dragonwell.sh && rm -rf /tmp/java ENV PATH="/opt/occlum/toolchains/jvm/bin:$PATH" +# Install OpenJDK 8 +ARG JDK8_PATH=/opt/occlum/toolchains/jvm/java-1.8-openjdk +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 + # Build and install Occlum WORKDIR /root RUN cd occlum && \ diff --git a/tools/docker/Dockerfile.ubuntu18.04 b/tools/docker/Dockerfile.ubuntu18.04 index e2b90253..8410128a 100644 --- a/tools/docker/Dockerfile.ubuntu18.04 +++ b/tools/docker/Dockerfile.ubuntu18.04 @@ -3,7 +3,7 @@ FROM alpine:3.11 AS alpine LABEL maintainer="Qing Li " RUN apk update && \ - apk --no-cache add openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + apk --no-cache add openjdk11 openjdk8 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community FROM ubuntu:18.04 @@ -173,6 +173,12 @@ WORKDIR /tmp RUN cd java && ./install_dragonwell.sh && rm -rf /tmp/java ENV PATH="/opt/occlum/toolchains/jvm/bin:$PATH" +# Install OpenJDK 8 +ARG JDK8_PATH=/opt/occlum/toolchains/jvm/java-1.8-openjdk +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 + WORKDIR /root RUN cd occlum && \ source /opt/intel/sgxsdk/environment && \