From f830757799ed2ad8ca3e530a2b94766499dd42ac Mon Sep 17 00:00:00 2001 From: Piotr Roslaniec Date: Thu, 3 Oct 2019 14:59:59 +0200 Subject: [PATCH] Update SDK to v2.6 --- Dockerfile | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d264a3..437cf05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,27 +2,31 @@ FROM ubuntu:bionic WORKDIR /usr/src/sdk -RUN apt-get update && apt-get install -yq --no-install-recommends ca-certificates build-essential ocaml ocamlbuild automake autoconf libtool wget python libssl-dev libssl-dev libcurl4-openssl-dev protobuf-compiler git libprotobuf-dev alien cmake debhelper uuid-dev libxml2-dev +RUN apt-get update && apt-get install -yq --no-install-recommends ca-certificates build-essential ocaml ocamlbuild automake autoconf \ + libtool wget python libssl-dev libssl-dev libcurl4-openssl-dev protobuf-compiler git libprotobuf-dev alien cmake debhelper uuid-dev \ + libxml2-dev xxd -RUN wget --progress=dot:mega -O iclsclient.rpm http://registrationcenter-download.intel.com/akdlm/irc_nas/11414/iclsClient-1.45.449.12-1.x86_64.rpm && \ - alien --scripts -i iclsclient.rpm && \ - rm iclsclient.rpm +# The download link is broken (404) +# RUN wget --progress=dot:mega -O iclsclient.rpm http://registrationcenter-download.intel.com/akdlm/irc_nas/11414/iclsClient-1.45.449.12-1.x86_64.rpm && \ +# alien --scripts -i iclsclient.rpm && \ +# rm iclsclient.rpm -RUN wget --progress=dot:mega -O - https://github.com/intel/dynamic-application-loader-host-interface/archive/072d233296c15d0dcd1fb4570694d0244729f87b.tar.gz | tar -xz && \ - cd dynamic-application-loader-host-interface-072d233296c15d0dcd1fb4570694d0244729f87b && \ +RUN git clone https://github.com/01org/dynamic-application-loader-host-interface.git && \ + cd dynamic-application-loader-host-interface && \ cmake . -DCMAKE_BUILD_TYPE=Release -DINIT_SYSTEM=SysVinit && \ + make && \ make install && \ - cd .. && rm -rf dynamic-application-loader-host-interface-072d233296c15d0dcd1fb4570694d0244729f87b + cd .. && rm -rf dynamic-application-loader-host-interface COPY install-psw.patch ./ -RUN git clone -b sgx_2.5 --depth 1 https://github.com/intel/linux-sgx && \ +RUN git clone -b sgx_2.6 --depth 1 https://github.com/intel/linux-sgx && \ cd linux-sgx && \ patch -p1 -i ../install-psw.patch && \ ./download_prebuilt.sh 2> /dev/null && \ make -s -j$(nproc) sdk_install_pkg psw_install_pkg && \ - ./linux/installer/bin/sgx_linux_x64_sdk_2.5.100.49891.bin --prefix=/opt/intel && \ - ./linux/installer/bin/sgx_linux_x64_psw_2.5.100.49891.bin && \ + ./linux/installer/bin/sgx_linux_x64_sdk_*.bin --prefix=/opt/intel && \ + ./linux/installer/bin/sgx_linux_x64_psw_*.bin && \ cd .. && rm -rf linux-sgx/ WORKDIR /usr/src/app