This is an automated email from the ASF dual-hosted git repository.
rduan pushed a commit to branch v1.1.4-testing
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-sgx-sdk.git
The following commit(s) were added to refs/heads/v1.1.4-testing by this push:
new bfe851b docker: Update Dockfile (intel sgx sdk 2.14, DCAP 1.11)
bfe851b is described below
commit bfe851bcf709f24a15ec4f2384df04cb6b12dff0
Author: volcano <[email protected]>
AuthorDate: Mon Jul 19 18:06:40 2021 +0800
docker: Update Dockfile (intel sgx sdk 2.14, DCAP 1.11)
---
dockerfile/02_binutils.sh | 2 +-
dockerfile/03_sdk.sh | 4 ++--
dockerfile/04_psw_deb.sh | 2 +-
dockerfile/Dockerfile.1604.nightly | 4 ++--
dockerfile/Dockerfile.1804.nightly | 6 +++---
dockerfile/Dockerfile.2004.nightly | 6 +++---
dockerfile/Dockerfile.centos8.nightly | 4 ++--
dockerfile/Dockerfile.fedora31.nightly | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dockerfile/02_binutils.sh b/dockerfile/02_binutils.sh
index caef007..eff4ffa 100644
--- a/dockerfile/02_binutils.sh
+++ b/dockerfile/02_binutils.sh
@@ -1,7 +1,7 @@
if [ $BINUTILS_DIST != "SELF_BUILT" ]
then
cd /root && \
- wget
https://download.01.org/intel-sgx/sgx-linux/2.13/as.ld.objdump.gold.r3.tar.gz
&& \
+ wget
https://download.01.org/intel-sgx/sgx-linux/2.14/as.ld.objdump.gold.r3.tar.gz
&& \
tar xzf as.ld.objdump.gold.r3.tar.gz && \
cp -r external/toolset/$BINUTILS_DIST/* /usr/bin/ && \
rm -rf ./external ./as.ld.objdump.gold.r3.tar.gz
diff --git a/dockerfile/03_sdk.sh b/dockerfile/03_sdk.sh
index 0dcdb01..6df5d41 100644
--- a/dockerfile/03_sdk.sh
+++ b/dockerfile/03_sdk.sh
@@ -10,10 +10,10 @@ else
cd /root && \
git clone --recursive https://github.com/intel/linux-sgx && \
cd linux-sgx && \
- git checkout sgx_2.13 && \
+ git checkout sgx_2.14 && \
./download_prebuilt.sh && \
make -j "$(nproc)" sdk_install_pkg && \
- echo -e 'no\n/opt' |
./linux/installer/bin/sgx_linux_x64_sdk_2.13.100.4.bin && \
+ echo -e 'no\n/opt' |
./linux/installer/bin/sgx_linux_x64_sdk_2.14.100.2.bin && \
echo 'source /opt/sgxsdk/environment' >> /root/.bashrc && \
cd /root && \
rm -rf /root/linux-sgx
diff --git a/dockerfile/04_psw_deb.sh b/dockerfile/04_psw_deb.sh
index 9db9c53..5eae363 100644
--- a/dockerfile/04_psw_deb.sh
+++ b/dockerfile/04_psw_deb.sh
@@ -2,7 +2,7 @@ source /opt/sgxsdk/environment && \
cd /root && \
git clone --recursive https://github.com/intel/linux-sgx && \
cd linux-sgx && \
-git checkout sgx_2.13 && \
+git checkout sgx_2.14 && \
./download_prebuilt.sh && \
make deb_local_repo && \
cd linux/installer/deb && \
diff --git a/dockerfile/Dockerfile.1604.nightly
b/dockerfile/Dockerfile.1604.nightly
index 6ea6cbc..037b5e7 100644
--- a/dockerfile/Dockerfile.1604.nightly
+++ b/dockerfile/Dockerfile.1604.nightly
@@ -31,8 +31,8 @@ RUN bash /root/03_sdk.sh
# Sixth, PSW
ENV CODENAME xenial
-ENV VERSION 2.13.100.4-xenial1
-ENV DCAP_VERSION 1.10.100.4-xenial1
+ENV VERSION 2.14.100.2-xenial1
+ENV DCAP_VERSION 1.11.100.2-xenial1
ADD 04_psw.sh /root
RUN bash /root/04_psw.sh
diff --git a/dockerfile/Dockerfile.1804.nightly
b/dockerfile/Dockerfile.1804.nightly
index b94eda5..006b4c0 100644
--- a/dockerfile/Dockerfile.1804.nightly
+++ b/dockerfile/Dockerfile.1804.nightly
@@ -15,7 +15,7 @@ ADD 02_binutils.sh /root
RUN bash /root/02_binutils.sh
ENV SDK_DIST="INTEL_BUILT"
-ENV
SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.13/distro/ubuntu18.04-server/sgx_linux_x64_sdk_2.13.100.4.bin";
+ENV
SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.14/distro/ubuntu18.04-server/sgx_linux_x64_sdk_2.14.100.2.bin";
#ENV SDK_DIST="SELF_BUILT"
ADD 03_sdk.sh /root
RUN bash /root/03_sdk.sh
@@ -23,8 +23,8 @@ RUN bash /root/03_sdk.sh
# Sixth, PSW
ENV CODENAME bionic
-ENV VERSION 2.13.100.4-bionic1
-ENV DCAP_VERSION 1.10.100.4-bionic1
+ENV VERSION 2.14.100.2-bionic1
+ENV DCAP_VERSION 1.11.100.2-bionic1
ADD 04_psw.sh /root
RUN bash /root/04_psw.sh
diff --git a/dockerfile/Dockerfile.2004.nightly
b/dockerfile/Dockerfile.2004.nightly
index 468de3a..1a8c16d 100644
--- a/dockerfile/Dockerfile.2004.nightly
+++ b/dockerfile/Dockerfile.2004.nightly
@@ -19,15 +19,15 @@ RUN bash /root/02_binutils.sh
#ENV SDK_DIST="SELF_BUILT"
ENV SDK_DIST="INTEL_BUILT"
-ENV
SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.13/distro/ubuntu20.04-server/sgx_linux_x64_sdk_2.13.100.4.bin";
+ENV
SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.14/distro/ubuntu20.04-server/sgx_linux_x64_sdk_2.14.100.2.bin";
ADD 03_sdk.sh /root
RUN bash /root/03_sdk.sh
# Sixth, PSW
ENV CODENAME focal
-ENV VERSION 2.13.100.4-focal1
-ENV DCAP_VERSION 1.10.100.4-focal1
+ENV VERSION 2.14.100.2-focal1
+ENV DCAP_VERSION 1.11.100.2-focal1
ADD 04_psw.sh /root
RUN bash /root/04_psw.sh
diff --git a/dockerfile/Dockerfile.centos8.nightly
b/dockerfile/Dockerfile.centos8.nightly
index f058508..4e1e8b4 100644
--- a/dockerfile/Dockerfile.centos8.nightly
+++ b/dockerfile/Dockerfile.centos8.nightly
@@ -13,12 +13,12 @@ ADD 02_binutils.sh /root
RUN bash /root/02_binutils.sh
ENV SDK_DIST="INTEL_BUILT"
-ENV
SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.13/distro/centos8.2-server/sgx_linux_x64_sdk_2.13.100.4.bin";
+ENV
SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.14/distro/centos8.2-server/sgx_linux_x64_sdk_2.14.100.2.bin";
#ENV SDK_DIST="SELF_BUILT"
ADD 03_sdk.sh /root
RUN bash /root/03_sdk.sh
-ENV
PSW_REPO="https://download.01.org/intel-sgx/sgx-linux/2.13/distro/centos8.2-server/sgx_rpm_local_repo.tgz";
+ENV
PSW_REPO="https://download.01.org/intel-sgx/sgx-linux/2.14/distro/centos8.2-server/sgx_rpm_local_repo.tgz";
ADD 04_psw_rpm.sh /root
RUN bash /root/04_psw_rpm.sh
diff --git a/dockerfile/Dockerfile.fedora31.nightly
b/dockerfile/Dockerfile.fedora31.nightly
index 9f7e0a9..5181966 100644
--- a/dockerfile/Dockerfile.fedora31.nightly
+++ b/dockerfile/Dockerfile.fedora31.nightly
@@ -15,14 +15,14 @@ ADD 02_binutils.sh /root
RUN bash /root/02_binutils.sh
ENV SDK_DIST="INTEL_BUILT"
-ENV
SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.13/distro/fedora31-server/sgx_linux_x64_sdk_2.13.100.4.bin";
+ENV
SDK_URL="https://download.01.org/intel-sgx/sgx-linux/2.14/distro/fedora31-server/sgx_linux_x64_sdk_2.14.100.2.bin";
#ENV SDK_DIST="SELF_BUILT"
ADD 03_sdk.sh /root
RUN bash /root/03_sdk.sh
# Sixth, PSW
-ENV
PSW_REPO=https://download.01.org/intel-sgx/sgx-linux/2.13/distro/fedora31-server/sgx_rpm_local_repo.tgz
+ENV
PSW_REPO="https://download.01.org/intel-sgx/sgx-linux/2.14/distro/fedora31-server/sgx_rpm_local_repo.tgz";
ADD 04_psw_rpm.sh /root
RUN bash /root/04_psw_rpm.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
