From 84fde0e1e6975b3faa13b74b7fc707cf2b98cbb5 Mon Sep 17 00:00:00 2001 From: "Zheng, Qi" Date: Tue, 25 Apr 2023 17:39:35 +0800 Subject: [PATCH] [dockerfile] Remove dockerfiles not supported --- tools/docker/Dockerfile.anolis8.4 | 202 ---------------------------- tools/docker/Dockerfile.centos8.2 | 187 ------------------------- tools/docker/Dockerfile.ubuntu18.04 | 198 --------------------------- tools/docker/README.md | 4 +- tools/docker/build_image.sh | 6 +- 5 files changed, 4 insertions(+), 593 deletions(-) delete mode 100644 tools/docker/Dockerfile.anolis8.4 delete mode 100644 tools/docker/Dockerfile.centos8.2 delete mode 100644 tools/docker/Dockerfile.ubuntu18.04 diff --git a/tools/docker/Dockerfile.anolis8.4 b/tools/docker/Dockerfile.anolis8.4 deleted file mode 100644 index a7a86ea3..00000000 --- a/tools/docker/Dockerfile.anolis8.4 +++ /dev/null @@ -1,202 +0,0 @@ -#Notice:Anolis is not an official supported distribution now. Take your own risk to use it. -FROM alpine:3.11 AS alpine - -RUN apk update && \ - apk --no-cache add openjdk11 openjdk8 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - -FROM openanolis/anolisos:8.4-x86_64 - -LABEL maintainer="Chunyang Hui " - -#The default shell for the RUN instruction is ["/bin/sh", "-c"], which sometimes cause unexpected error -#for example "source a_file". Use bash as default shell instead. -SHELL ["/bin/bash", "-c"] - -RUN yum install -y epel-release && \ - yum install -y --nogpgcheck \ - epel-release \ - astyle \ - autoconf \ - automake \ - bison \ - bzip2 \ - boost-devel \ - ca-certificates \ - clang \ - cmake \ - curl \ - curl-devel \ - createrepo \ - expect \ - expat \ - expat-devel \ - gettext \ - file \ - fuse-devel \ - fuse-libs \ - gawk \ - gcc \ - gcc-c++ \ - glibc-headers \ - gdb \ - git-core \ - gmp-devel \ - golang \ - jq \ - libmpc-devel \ - libxml2-devel \ - libtool \ - pkgconfig \ - python2 \ - kmod \ - make \ - mod_ssl \ - mpfr-devel \ - ocaml \ - ocaml-ocamlbuild \ - openssl \ - openssl-devel \ - patch \ - python3 \ - sudo \ - uuid-devel \ - vim \ - wget \ - yum-utils \ - rpm-build \ - git \ - protobuf \ - protobuf-c \ - protobuf-compiler \ - protobuf-c-compiler \ - protobuf-c-devel \ - protobuf-devel \ - rsync && \ - yum groupinstall -y 'Development Tools' && \ - yum clean all && \ - alternatives --set python /usr/bin/python3 - -# Anolis8.4 use GCC 8.4.1 as default toolchain - -# Install PSW and DCAP RPM packages -WORKDIR /tmp -RUN wget https://mirrors.openanolis.cn/inclavare-containers/bin/anolis8.4/sgx-2.17/sgx_rpm_local_repo.tar.gz && \ - tar -xzf sgx_rpm_local_repo.tar.gz && \ - rm -f sgx_rpm_local_repo.tar.gz && \ - cd /tmp/sgx_rpm_local_repo && \ - rpm -ivh --nodeps libsgx-ae-pce*.rpm \ - libsgx-headers*.rpm \ - libsgx-ae-qe3*.rpm \ - libsgx-ae-qve*.rpm \ - libsgx-enclave-common*.rpm \ - libsgx-quote-ex*.rpm \ - libsgx-urts*.rpm \ - libsgx-dcap-ql*.rpm \ - libsgx-qe3-logic*.rpm \ - libsgx-pce-logic*.rpm \ - libsgx-dcap-quote-verify*.rpm \ - libsgx-dcap-ql*.rpm \ - libsgx-dcap-ql-dev*.rpm \ - libsgx-dcap-default-qpl*.rpm \ - libsgx-dcap-default-qpl-dev*.rpm \ - libsgx-dcap-quote-verify-dev*.rpm \ - libsgx-uae-service*.rpm \ - libsgx-epid*.rpm \ - libsgx-launch*.rpm \ - libsgx-ae-le-*.rpm \ - libsgx-aesm-launch-plugin-*.rpm \ - sgx-aesm-service*.rpm && \ - rm -rf /tmp/sgx_rpm_local_repo - -# Install SGX SDK -WORKDIR /tmp -WORKDIR /tmp -RUN git clone -b sgx_2.17.1_for_occlum https://github.com/occlum/linux-sgx && \ - mkdir /etc/init && \ - cd linux-sgx && \ - make preparation && \ - ./compile_and_install.sh no_mitigation USE_OPT_LIBS=3 && \ - echo 'source /opt/intel/sgxsdk/environment' >> /root/.bashrc && \ - rm -rf /tmp/linux-sgx - -# Install cpuid tool for tests -WORKDIR /tmp -RUN wget http://www.etallen.com/cpuid/cpuid-20200211.x86_64.tar.gz && \ - tar -xf ./cpuid-20200211.x86_64.tar.gz && \ - cp ./cpuid-20200211/cpuid /usr/bin/ && \ - rm -rf /tmp/cpuid-20200211* - -# Download the Occlum source -ARG OCCLUM_BRANCH -WORKDIR /root -RUN git clone -b $OCCLUM_BRANCH https://github.com/occlum/occlum && \ - cp -r /root/occlum/tools/toolchains/* /tmp/ && mkdir -p /opt/occlum/ && \ - cp /root/occlum/tools/docker/start_aesm.sh /opt/occlum/ - -# Install Occlum toolchain -WORKDIR /tmp -RUN cd musl-gcc && ./build.sh && ./install_zlib.sh && rm -rf /tmp/musl-gcc -ENV PATH="/opt/occlum/build/bin:/usr/local/occlum/bin:$PATH" - -# Install glibc -WORKDIR /tmp -RUN cd glibc && ./build.sh && rm -rf /tmp/glibc - -# Install Occlum Golang toolchain -WORKDIR /tmp -RUN cd golang && ./build.sh && rm -rf /tmp/golang -ENV PATH="/opt/occlum/toolchains/golang/bin:$PATH" - -# Install Rust -ENV PATH="/root/.cargo/bin:$PATH" -ENV OCCLUM_RUST_VERSION=nightly-2022-02-23 -RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \ - rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \ - cargo -V - -# Install Occlum Rust toolchain -WORKDIR /tmp -RUN cd rust && ./build.sh && rm -rf /tmp/rust -ENV PATH="/opt/occlum/toolchains/rust/bin:$PATH" - -# Install Occlum bash -WORKDIR /tmp -RUN cd bash && ./build.sh && rm -rf /tmp/bash - -# Install Occlum busybox -WORKDIR /tmp -RUN cd busybox && ./build.sh && rm -rf /tmp/busybox - -# Install Occlum Java toolchain (JDK 11) -ARG JDK11_PATH=/opt/occlum/toolchains/jvm/java-11-openjdk -COPY --from=alpine /usr/lib/jvm/java-11-openjdk $JDK11_PATH -RUN rm $JDK11_PATH/lib/security/cacerts -COPY --from=alpine /etc/ssl/certs/java/cacerts $JDK11_PATH/lib/security/cacerts -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 && \ - source /opt/intel/sgxsdk/environment && \ - make submodule && \ - OCCLUM_RELEASE_BUILD=1 make install && \ - cp -r demos /root/demos && \ - rm -rf /root/occlum - -# Start AESM service automatically -# -# To do so, we add the script to ~/.bashrc. We cannot use systemd to run AESM -# as a "real" service since the pid 1 is not systemd in Docker. So we start -# up AESM service when an user login with an interactive shell. -RUN mkdir -p /var/run/aesmd && echo '/opt/occlum/start_aesm.sh' >> /root/.bashrc - -WORKDIR /root diff --git a/tools/docker/Dockerfile.centos8.2 b/tools/docker/Dockerfile.centos8.2 deleted file mode 100644 index 9f19bf16..00000000 --- a/tools/docker/Dockerfile.centos8.2 +++ /dev/null @@ -1,187 +0,0 @@ -FROM alpine:3.11 AS alpine -LABEL maintainer="Qing Li " -RUN apk update && \ - apk --no-cache add openjdk11 openjdk8 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - -FROM centos:8 - -RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* &&\ - sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* - -RUN yum upgrade -y - -LABEL maintainer="He Sun " - -#The default shell for the RUN instruction is ["/bin/sh", "-c"], which sometimes cause unexpected error -#for example "source a_file". Use bash as default shell instead. -SHELL ["/bin/bash", "-c"] - -# since cmake is updated to 3.18.2-9.el8, it must work with libarchive. -RUN yum install epel-release -y && \ - dnf clean all && rm -r /var/cache/dnf && \ - dnf group install 'Development Tools' -y && \ - dnf -y install dnf-plugins-core && \ - dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ - dnf config-manager --set-enabled powertools && \ - dnf install -y \ - astyle \ - bison \ - boost-devel \ - clang \ - cmake \ - createrepo \ - curl-devel \ - expect \ - fuse-devel \ - fuse-libs \ - gawk \ - gmp-devel \ - golang \ - jq \ - libarchive \ - libcurl-devel \ - libmpc-devel \ - libxml2-devel \ - mod_ssl \ - mpfr-devel \ - nano \ - ocaml \ - ocaml-ocamlbuild \ - openssl \ - openssl-devel \ - perl \ - protobuf-devel \ - python2 \ - python3 \ - sudo \ - wget \ - uuid-devel \ - vim \ - yum-utils \ - rsync \ - http://downloads.sourceforge.net/ltp/lcov-1.14-1.noarch.rpm &&\ - alternatives --set python /usr/bin/python2 - -# Install cpuid tool for tests -WORKDIR /tmp -RUN wget http://www.etallen.com/cpuid/cpuid-20200211.x86_64.tar.gz && \ - tar -xf ./cpuid-20200211.x86_64.tar.gz && \ - cp ./cpuid-20200211/cpuid /usr/bin/ && \ - rm -rf /tmp/cpuid-20200211* - -# Install Rust -ENV PATH="/root/.cargo/bin:$PATH" -ENV OCCLUM_RUST_VERSION=nightly-2021-11-01 -RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \ - rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \ - cargo -V - -# Install SGX PSW -WORKDIR /tmp -RUN echo "ca_directory=/etc/ssl/certs" >> /etc/wgetrc && \ - wget https://download.01.org/intel-sgx/sgx-linux/2.15.1/distro/centos8.2-server/sgx_rpm_local_repo.tgz && \ - tar -xvf sgx_rpm_local_repo.tgz && \ - rm sgx_rpm_local_repo.tgz && \ - cd /tmp/sgx_rpm_local_repo && \ - rpm -ivh libsgx-ae-pce*.rpm \ - libsgx-headers*.rpm \ - libsgx-ae-qe3*.rpm \ - libsgx-ae-qve*.rpm \ - libsgx-enclave-common*.rpm \ - libsgx-quote-ex*.rpm \ - libsgx-urts*.rpm \ - libsgx-dcap-ql*.rpm \ - libsgx-qe3-logic*.rpm \ - libsgx-pce-logic*.rpm \ - libsgx-dcap-quote-verify*.rpm \ - libsgx-dcap-ql*.rpm \ - libsgx-dcap-ql-dev*.rpm \ - libsgx-dcap-default-qpl*.rpm \ - libsgx-dcap-default-qpl-dev*.rpm \ - libsgx-dcap-quote-verify-dev*.rpm \ - libsgx-uae-service*.rpm \ - libsgx-epid*.rpm \ - libsgx-launch*.rpm \ - libsgx-ae-le-*.rpm \ - libsgx-aesm-launch-plugin-*.rpm \ - sgx-aesm-service*.rpm && \ - rm -rf /tmp/sgx_rpm_local_repo - -# Install SGX SDK -WORKDIR /tmp -RUN git clone -b sgx_2.15.1_for_occlum https://github.com/occlum/linux-sgx && \ - cd linux-sgx && \ - make preparation && \ - ./compile_and_install.sh no_mitigation USE_OPT_LIBS=3 && \ - echo 'source /opt/intel/sgxsdk/environment' >> /root/.bashrc && \ - rm -rf /tmp/linux-sgx - -# Download the Occlum source -ARG OCCLUM_BRANCH -WORKDIR /root -RUN git clone -b $OCCLUM_BRANCH https://github.com/occlum/occlum && \ - cp -r /root/occlum/tools/toolchains/* /tmp/ && mkdir -p /opt/occlum/ && \ - cp /root/occlum/tools/docker/start_aesm.sh /opt/occlum/ - -# Install Occlum toolchain -WORKDIR /tmp -RUN cd musl-gcc && ./build.sh && ./install_zlib.sh && rm -rf /tmp/musl-gcc -ENV PATH="/opt/occlum/build/bin:/usr/local/occlum/bin:$PATH" - -# Install glibc -WORKDIR /tmp -RUN cd glibc && ./build.sh && rm -rf /tmp/glibc - -# Install Occlum Golang toolchain -WORKDIR /tmp -RUN cd golang && ./build.sh && rm -rf /tmp/golang -ENV PATH="/opt/occlum/toolchains/golang/bin:$PATH" - -# Install Occlum Rust toolchain -WORKDIR /tmp -RUN cd rust && ./build.sh && rm -rf /tmp/rust -ENV PATH="/opt/occlum/toolchains/rust/bin:$PATH" -ENV LD_LIBRARY_PATH="/opt/intel/sgxsdk/sdk_libs" - -# Install Occlum bash -WORKDIR /tmp -RUN cd bash && ./build.sh && rm -rf /tmp/bash - -# Install Occlum busybox -WORKDIR /tmp -RUN cd busybox && ./build.sh && rm -rf /tmp/busybox - -# Install Occlum Java toolchain (JDK 11) -ARG JDK11_PATH=/opt/occlum/toolchains/jvm/java-11-openjdk -COPY --from=alpine /usr/lib/jvm/java-11-openjdk $JDK11_PATH -RUN rm $JDK11_PATH/lib/security/cacerts -COPY --from=alpine /etc/ssl/certs/java/cacerts $JDK11_PATH/lib/security/cacerts -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 && \ - source /opt/intel/sgxsdk/environment && \ - make submodule && \ - OCCLUM_RELEASE_BUILD=1 make && \ - make install && \ - cp -r demos /root/demos && \ - rm -rf /root/occlum - -# Start AESM service automatically -# -# To do so, we add the script to ~/.bashrc. We cannot use systemd to run AESM -# as a "real" service since the pid 1 is not systemd in Docker. So we start -# up AESM service when an user login with an interactive shell. -RUN mkdir -p /var/run/aesmd && echo '/opt/occlum/start_aesm.sh' >> /root/.bashrc - -WORKDIR /root diff --git a/tools/docker/Dockerfile.ubuntu18.04 b/tools/docker/Dockerfile.ubuntu18.04 deleted file mode 100644 index f3bd2586..00000000 --- a/tools/docker/Dockerfile.ubuntu18.04 +++ /dev/null @@ -1,198 +0,0 @@ -FROM alpine:3.11 AS alpine - -LABEL maintainer="Qing Li " - -RUN apk update && \ - apk --no-cache add openjdk11 openjdk8 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - -FROM ubuntu:18.04 - -LABEL maintainer="Qing Li " - -#The default shell for the RUN instruction is ["/bin/sh", "-c"], which sometimes cause unexpected error -#for example "source a_file". Use bash as default shell instead. -SHELL ["/bin/bash", "-c"] - -RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \ - alien \ - astyle \ - autoconf \ - automake \ - bison \ - build-essential \ - ca-certificates \ - cmake \ - curl \ - debhelper \ - expect \ - g++ \ - gawk \ - gdb \ - git-core \ - golang-go \ - jq \ - kmod \ - lcov \ - libboost-system-dev \ - libboost-thread-dev \ - libclang-dev \ - libcurl4-openssl-dev \ - libfuse-dev \ - libjsoncpp-dev \ - liblog4cpp5-dev \ - libprotobuf-c0-dev \ - libprotobuf-dev \ - libssl-dev \ - libtool \ - libxml2-dev \ - nano \ - ocaml \ - ocamlbuild \ - pkg-config \ - protobuf-compiler \ - python \ - python-pip \ - sudo \ - unzip \ - uuid-dev \ - vim \ - wget \ - zip \ - gnupg \ - aptitude \ - rsync \ - && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN echo "ca_directory=/etc/ssl/certs" >> /etc/wgetrc && \ - echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu bionic main' | tee /etc/apt/sources.list.d/intel-sgx.list &&\ - wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key --no-check-certificate | apt-key add - - -# Install cpuid tool for tests -WORKDIR /tmp -RUN wget http://www.etallen.com/cpuid/cpuid-20200211.x86_64.tar.gz && \ - tar -xf ./cpuid-20200211.x86_64.tar.gz && \ - cp ./cpuid-20200211/cpuid /usr/bin/ && \ - rm -rf /tmp/cpuid-20200211* - -# Install Rust -ENV PATH="/root/.cargo/bin:$PATH" -ENV OCCLUM_RUST_VERSION=nightly-2021-09-13 -RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \ - rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \ - cargo -V - -# Install SGX PSW -ARG PSW_VERSION=2.15.101.1 -ARG DCAP_VERSION=1.12.101.1 -RUN apt-get update && aptitude install -y \ - libsgx-launch-dev=$PSW_VERSION-bionic1 \ - libsgx-epid-dev=$PSW_VERSION-bionic1 \ - libsgx-quote-ex-dev=$PSW_VERSION-bionic1 \ - libsgx-urts=$PSW_VERSION-bionic1 \ - libsgx-enclave-common=$PSW_VERSION-bionic1 \ - libsgx-uae-service=$PSW_VERSION-bionic1 \ - libsgx-ae-epid=$PSW_VERSION-bionic1 \ - libsgx-ae-le=$PSW_VERSION-bionic1 \ - libsgx-ae-pce=$PSW_VERSION-bionic1 \ - libsgx-aesm-launch-plugin=$PSW_VERSION-bionic1 \ - sgx-aesm-service=$PSW_VERSION-bionic1 \ - libsgx-aesm-launch-plugin=$PSW_VERSION-bionic1 \ - libsgx-aesm-pce-plugin=$PSW_VERSION-bionic1 \ - libsgx-aesm-ecdsa-plugin=$PSW_VERSION-bionic1 \ - libsgx-aesm-epid-plugin=$PSW_VERSION-bionic1 \ - libsgx-aesm-quote-ex-plugin=$PSW_VERSION-bionic1 \ - libsgx-dcap-quote-verify=$DCAP_VERSION-bionic1 \ - libsgx-dcap-quote-verify-dev=$DCAP_VERSION-bionic1 \ - libsgx-dcap-ql=$DCAP_VERSION-bionic1 \ - libsgx-dcap-ql-dev=$DCAP_VERSION-bionic1 \ - libsgx-epid=$PSW_VERSION-bionic1 \ - libsgx-quote-ex=$PSW_VERSION-bionic1 \ - libsgx-pce-logic=$DCAP_VERSION-bionic1 \ - libsgx-qe3-logic=$DCAP_VERSION-bionic1 \ - libsgx-launch=$PSW_VERSION-bionic1 \ - libsgx-dcap-default-qpl=$DCAP_VERSION-bionic1 \ - && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* && \ - ln -s /usr/lib/x86_64-linux-gnu/libsgx_enclave_common.so.1 /usr/lib/x86_64-linux-gnu/libsgx_enclave_common.so - -# Install SGX SDK -WORKDIR /tmp -RUN git clone -b sgx_2.15.1_for_occlum https://github.com/occlum/linux-sgx && \ - mkdir /etc/init && \ - cd linux-sgx && \ - make preparation && \ - ./compile_and_install.sh no_mitigation USE_OPT_LIBS=3 && \ - echo 'source /opt/intel/sgxsdk/environment' >> /root/.bashrc && \ - rm -rf /tmp/linux-sgx - -# Download the Occlum source -ARG OCCLUM_BRANCH -WORKDIR /root -RUN git clone -b $OCCLUM_BRANCH https://github.com/occlum/occlum && \ - cp -r /root/occlum/tools/toolchains/* /tmp/ && mkdir -p /opt/occlum/ && \ - cp /root/occlum/tools/docker/start_aesm.sh /opt/occlum/ - -# Install Occlum toolchain -WORKDIR /tmp -RUN cd musl-gcc && ./build.sh && ./install_zlib.sh && rm -rf /tmp/musl-gcc -ENV PATH="/opt/occlum/build/bin:/usr/local/occlum/bin:$PATH" - -# Install glibc -WORKDIR /tmp -RUN cd glibc && ./build.sh && rm -rf /tmp/glibc - -# Install Occlum Golang toolchain -WORKDIR /tmp -RUN cd golang && ./build.sh && rm -rf /tmp/golang -ENV PATH="/opt/occlum/toolchains/golang/bin:$PATH" - -# Install Occlum Rust toolchain -WORKDIR /tmp -RUN cd rust && ./build.sh && rm -rf /tmp/rust -ENV PATH="/opt/occlum/toolchains/rust/bin:$PATH" -ENV LD_LIBRARY_PATH="/opt/intel/sgxsdk/sdk_libs" - -# Install Occlum bash -WORKDIR /tmp -RUN cd bash && ./build.sh && rm -rf /tmp/bash - -# Install Occlum busybox -WORKDIR /tmp -RUN cd busybox && ./build.sh && rm -rf /tmp/busybox - -# Install Occlum Java toolchain (JDK 11) -ARG JDK11_PATH=/opt/occlum/toolchains/jvm/java-11-openjdk -COPY --from=alpine /usr/lib/jvm/java-11-openjdk $JDK11_PATH -RUN rm $JDK11_PATH/lib/security/cacerts -COPY --from=alpine /etc/ssl/certs/java/cacerts $JDK11_PATH/lib/security/cacerts -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 && \ - make submodule && \ - OCCLUM_RELEASE_BUILD=1 make && \ - make install && \ - cp -r demos /root/demos && \ - rm -rf /root/occlum - -# Start AESM service automatically -# -# To do so, we add the script to ~/.bashrc. We cannot use systemd to run AESM -# as a "real" service since the pid 1 is not systemd in Docker. So we start -# up AESM service when an user login with an interactive shell. -RUN mkdir -p /var/run/aesmd && echo '/opt/occlum/start_aesm.sh' >> /root/.bashrc - -WORKDIR /root diff --git a/tools/docker/README.md b/tools/docker/README.md index f1385234..84c41677 100644 --- a/tools/docker/README.md +++ b/tools/docker/README.md @@ -4,7 +4,7 @@ This folder contains scripts and Dockerfiles for users to build the Docker image for Occlum. An Occlum Docker image sets up the development environment for Occlum and also gets Occlum preinstalled. -Currently, three Linux OS distributions are supported: Ubuntu 18.04, Ubuntu 20.04, CentOS 8.2, aliyunlinux3 and anolis8.4. +Currently, three Linux OS distributions are supported: Ubuntu 20.04, aliyunlinux3 and anolis8.8. ## How to Build @@ -17,7 +17,7 @@ describe the version of Occlum preinstalled in the Docker image (e.g., "latest", "0.24.0", and "prerelease") and `` is the name of the OS distribution that the Docker image is based on. Currently, `` must be one of the following values: -`ubuntu18.04`, `ubuntu20.04`, `centos8.2`, `aliyunlinux3` and `anolis8.4`. +`ubuntu20.04`, `aliyunlinux3` and `anolis8.8`. `` indicates which the docker image is built on, e.g "0.24.0". It is optional, if not provided, "master" branch will be used. diff --git a/tools/docker/build_image.sh b/tools/docker/build_image.sh index 466ee360..0d83363d 100755 --- a/tools/docker/build_image.sh +++ b/tools/docker/build_image.sh @@ -19,11 +19,9 @@ USAGE: : The name of the OS distribution that the Docker image is based on. Currently, must be one of the following values: - ubuntu18.04 Use Ubuntu 18.04 as the base image ubuntu20.04 Use Ubuntu 20.04 as the base image - centos8.2 Use CentOS 8.2 as the base image aliyunlinux3 Use AliyunLinux 3 as the base image - anolis8.4 Use Anolis 8.4 as the base image + anolis8.8 Use Anolis 8.8 as the base image : The Occlum branch which the docker image is built on, e.g "0.24.0". @@ -50,7 +48,7 @@ function check_item_in_list() { [[ $list =~ (^|[[:space:]])$item($|[[:space:]]) ]] } -check_item_in_list "$os_name" "ubuntu18.04 ubuntu20.04 centos8.2 aliyunlinux3 anolis8.4 anolis8.8" || report_error +check_item_in_list "$os_name" "ubuntu20.04 aliyunlinux3 anolis8.8" || report_error cd "$script_dir/.." docker build -f "$script_dir/Dockerfile.$os_name" -t "occlum/occlum:$occlum_label-$os_name" --build-arg OCCLUM_BRANCH=$occlum_branch .