You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by di...@apache.org on 2020/04/19 22:47:11 UTC
[incubator-teaclave-sgx-sdk] branch v1.1.2-testing updated: Update
dockerfiles
This is an automated email from the ASF dual-hosted git repository.
dingyu pushed a commit to branch v1.1.2-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.2-testing by this push:
new 6ebf8ac Update dockerfiles
6ebf8ac is described below
commit 6ebf8ac75c6ba60520daeca8bb850fa0a0b44d9b
Author: Yu Ding <di...@gmail.com>
AuthorDate: Sun Apr 19 15:47:00 2020 -0700
Update dockerfiles
---
dockerfile/02_binutils.sh | 2 +-
dockerfile/03_sdk.sh | 4 +--
dockerfile/Dockerfile.1604.full.nightly | 4 +--
dockerfile/Dockerfile.1604.nightly | 4 +--
dockerfile/Dockerfile.1804.nightly | 4 +--
dockerfile/Dockerfile.1804.unsafe.nightly | 6 ++--
dockerfile/Dockerfile.centos7.full.nightly | 44 --------------------------
dockerfile/Dockerfile.centos7.nightly | 51 ------------------------------
dockerfile/Dockerfile.fedora27.nightly | 9 +++---
9 files changed, 16 insertions(+), 112 deletions(-)
diff --git a/dockerfile/02_binutils.sh b/dockerfile/02_binutils.sh
index 93d23af..34d9dcc 100644
--- a/dockerfile/02_binutils.sh
+++ b/dockerfile/02_binutils.sh
@@ -1,5 +1,5 @@
#cd /root && \
-#wget https://download.01.org/intel-sgx/sgx-linux/2.9/as.ld.objdump.gold.r1.tar.gz && \
+#wget https://download.01.org/intel-sgx/sgx-linux/2.9.1/as.ld.objdump.gold.r1.tar.gz && \
#tar xzf as.ld.objdump.gold.r1.tar.gz && \
#cp external/toolset/* /usr/bin/
diff --git a/dockerfile/03_sdk.sh b/dockerfile/03_sdk.sh
index 5299e78..1f4f8b6 100644
--- a/dockerfile/03_sdk.sh
+++ b/dockerfile/03_sdk.sh
@@ -1,10 +1,10 @@
cd /root && \
git clone --recursive https://github.com/intel/linux-sgx && \
cd linux-sgx && \
-git checkout sgx_2.9 && \
+git checkout sgx_2.9.1 && \
./download_prebuilt.sh && \
make -j "$(nproc)" sdk_install_pkg && \
-echo -e 'no\n/opt' | ./linux/installer/bin/sgx_linux_x64_sdk_2.9.100.2.bin && \
+echo -e 'no\n/opt' | ./linux/installer/bin/sgx_linux_x64_sdk_2.9.101.2.bin && \
echo 'source /opt/sgxsdk/environment' >> /root/.bashrc && \
cd /root && \
rm -rf /root/linux-sgx
diff --git a/dockerfile/Dockerfile.1604.full.nightly b/dockerfile/Dockerfile.1604.full.nightly
index aa1d140..c25d4e8 100644
--- a/dockerfile/Dockerfile.1604.full.nightly
+++ b/dockerfile/Dockerfile.1604.full.nightly
@@ -17,14 +17,14 @@ RUN bash /root/03_sdk.sh
# Sixth, PSW
ENV CODENAME xenial
-ENV VERSION 2.9.100.2-xenial1
+ENV VERSION 2.9.101.2-xenial1
ADD 04_psw.sh /root
RUN bash /root/04_psw.sh
# Seventh, Rust
-ENV rust_toolchain nightly-2020-03-12
+ENV rust_toolchain nightly-2020-04-07
ADD 05_rust.sh /root
RUN bash /root/05_rust.sh
diff --git a/dockerfile/Dockerfile.1604.nightly b/dockerfile/Dockerfile.1604.nightly
index 749c8b6..7da909f 100644
--- a/dockerfile/Dockerfile.1604.nightly
+++ b/dockerfile/Dockerfile.1604.nightly
@@ -30,14 +30,14 @@ RUN bash /root/03_sdk.sh
# Sixth, PSW
ENV CODENAME xenial
-ENV VERSION 2.9.100.2-xenial1
+ENV VERSION 2.9.101.2-xenial1
ADD 04_psw.sh /root
RUN bash /root/04_psw.sh
# Seventh, Rust
-ENV rust_toolchain nightly-2020-03-12
+ENV rust_toolchain nightly-2020-04-07
ADD 05_rust.sh /root
RUN bash /root/05_rust.sh
diff --git a/dockerfile/Dockerfile.1804.nightly b/dockerfile/Dockerfile.1804.nightly
index a965da2..1fa5f0d 100644
--- a/dockerfile/Dockerfile.1804.nightly
+++ b/dockerfile/Dockerfile.1804.nightly
@@ -20,14 +20,14 @@ RUN bash /root/03_sdk.sh
# Sixth, PSW
ENV CODENAME bionic
-ENV VERSION 2.9.100.2-bionic1
+ENV VERSION 2.9.101.2-bionic1
ADD 04_psw.sh /root
RUN bash /root/04_psw.sh
# Seventh, Rust
-ENV rust_toolchain nightly-2020-03-12
+ENV rust_toolchain nightly-2020-04-07
ADD 05_rust.sh /root
RUN bash /root/05_rust.sh
diff --git a/dockerfile/Dockerfile.1804.unsafe.nightly b/dockerfile/Dockerfile.1804.unsafe.nightly
index e3dc98a..ce13df6 100644
--- a/dockerfile/Dockerfile.1804.unsafe.nightly
+++ b/dockerfile/Dockerfile.1804.unsafe.nightly
@@ -20,9 +20,9 @@ FROM ubuntu:18.04
MAINTAINER Yu Ding
ENV DEBIAN_FRONTEND=noninteractive
-ENV VERSION 2.9.100.2-bionic1
-ENV rust_toolchain nightly-2020-03-12
-ENV sdk_bin https://download.01.org/intel-sgx/sgx-linux/2.9/distro/ubuntu18.04-server/sgx_linux_x64_sdk_2.9.100.2.bin
+ENV VERSION 2.9.101.2-bionic1
+ENV rust_toolchain nightly-2020-04-07
+ENV sdk_bin https://download.01.org/intel-sgx/sgx-linux/2.9.1/distro/ubuntu18.04-server/sgx_linux_x64_sdk_2.9.101.2.bin
RUN apt-get update && \
apt-get install -y gnupg2 apt-transport-https ca-certificates curl software-properties-common build-essential automake autoconf libtool protobuf-compiler libprotobuf-dev git-core libprotobuf-c0-dev cmake pkg-config expect gdb && \
diff --git a/dockerfile/Dockerfile.centos7.full.nightly b/dockerfile/Dockerfile.centos7.full.nightly
deleted file mode 100644
index 721e470..0000000
--- a/dockerfile/Dockerfile.centos7.full.nightly
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM centos:7
-
-RUN yum-builddep gcc binutils -y && \
- yum install -y bzip2 ocaml ocaml-ocamlbuild wget python2 openssl-devel git protobuf-devel cmake && \
- yum groupinstall -y "Development Tools"
-
-ADD 01_gcc_8.sh /root
-RUN bash /root/01_gcc_8.sh
-
-ENV BINUTILS_PREFIX=/opt/binutils
-ENV LD_LIBRARY_PATH=/usr/lib
-
-ADD 02_binutils.sh /root
-RUN bash /root/02_binutils.sh && \
- cp -r /opt/binutils/bin/* /usr/bin/ && \
- cp -r /opt/binutils/lib/* /usr/lib/
-
-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.9/distro/centos7.5-server/sgx_rpm_local_repo.tgz
-
-RUN curl --output /root/repo.tgz $PSW_REPO && \
- cd /root && \
- tar xzf repo.tgz && \
- cd sgx_rpm_local_repo && \
- rpm -ivh ./*.rpm && \
- cd /root && \
- rm -rf sgx_rpm_local_repo
-
-# Seventh, Rust
-
-ENV rust_toolchain nightly-2020-03-12
-ADD 05_rust.sh /root
-RUN bash /root/05_rust.sh
-
-ENV rust_toolchain=
-ENV CODENAME=
-ENV VERSION=
-ENV PSW_REPO=
-
-WORKDIR /root
diff --git a/dockerfile/Dockerfile.centos7.nightly b/dockerfile/Dockerfile.centos7.nightly
deleted file mode 100644
index d682c57..0000000
--- a/dockerfile/Dockerfile.centos7.nightly
+++ /dev/null
@@ -1,51 +0,0 @@
-FROM centos:7
-
-RUN yum install -y bzip2 ocaml ocaml-ocamlbuild wget python2 openssl-devel git protobuf-devel cmake libtool automake && \
- yum groupinstall -y "Development Tools"
-
-#ADD 01_gcc_8.sh /root
-#RUN bash /root/01_gcc_8.sh
-
-RUN yum install -y centos-release-scl && \
- yum install -y devtoolset-8-gcc devtoolset-8-gcc-c++ zlib-devel flex bison texinfo && \
- mv /usr/bin/gcc /usr/bin/gcc.bak && \
- mv /usr/bin/g++ /usr/bin/g++.bak && \
- mv /usr/bin/c++ /usr/bin/c++.bak && \
- update-alternatives --install /usr/bin/gcc gcc /opt/rh/devtoolset-8/root/usr/bin/gcc 60 --slave /usr/bin/g++ g++ /opt/rh/devtoolset-8/root/usr/bin/g++ --slave /usr/bin/c++ c++ /opt/rh/devtoolset-8/root/usr/bin/c++
-
-ENV BINUTILS_PREFIX=/opt/binutils
-ENV LD_LIBRARY_PATH=/usr/lib
-
-ADD 02_binutils.sh /root
-RUN bash /root/02_binutils.sh
-
-RUN cp -r $BINUTILS_PREFIX/bin/* /opt/rh/devtoolset-8/root/usr/libexec/gcc/x86_64-redhat-linux/8/
-ENV LD_LIBRARY_PATH=$(BINUTILS_PREFIX)
-
-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.9/distro/centos7.5-server/sgx_rpm_local_repo.tgz
-
-RUN curl --output /root/repo.tgz $PSW_REPO && \
- cd /root && \
- tar xzf repo.tgz && \
- cd sgx_rpm_local_repo && \
- rpm -ivh ./*.rpm && \
- cd /root && \
- rm -rf sgx_rpm_local_repo
-
-# Seventh, Rust
-
-ENV rust_toolchain nightly-2020-03-12
-ADD 05_rust.sh /root
-RUN bash /root/05_rust.sh
-
-ENV rust_toolchain=
-ENV CODENAME=
-ENV VERSION=
-ENV PSW_REPO=
-
-WORKDIR /root
diff --git a/dockerfile/Dockerfile.fedora27.nightly b/dockerfile/Dockerfile.fedora27.nightly
index 50c614e..f71c1ff 100644
--- a/dockerfile/Dockerfile.fedora27.nightly
+++ b/dockerfile/Dockerfile.fedora27.nightly
@@ -1,9 +1,8 @@
FROM fedora:27
-RUN yum install yum-utils -y && \
- yum install -y bzip2 ocaml ocaml-ocamlbuild wget python2 openssl-devel git protobuf-devel cmake ncurses-devel libtool automake && \
+RUN yum install yum-utils bzip2 ocaml ocaml-ocamlbuild wget python2 openssl-devel git protobuf-devel ncurses-devel libtool automake redhat-rpm-config rpm-build cmake perl && \
yum-builddep gcc binutils -y && \
- yum groupinstall -y "Development Tools"
+ yum groupinstall -y 'C Development Tools and Libraries'
ADD 01_gcc_8.sh /root
RUN bash /root/01_gcc_8.sh
@@ -18,7 +17,7 @@ RUN bash /root/03_sdk.sh
# Sixth, PSW
-ENV PSW_REPO=https://download.01.org/intel-sgx/sgx-linux/2.9/distro/fedora27-server/sgx_rpm_local_repo.tgz
+ENV PSW_REPO=https://download.01.org/intel-sgx/sgx-linux/2.9.1/distro/fedora27-server/sgx_rpm_local_repo.tgz
RUN wget --output /root/repo.tgz $PSW_REPO && \
cd /root && \
@@ -30,7 +29,7 @@ RUN wget --output /root/repo.tgz $PSW_REPO && \
# Seventh, Rust
-ENV rust_toolchain nightly-2020-03-12
+ENV rust_toolchain nightly-2020-04-07
ADD 05_rust.sh /root
RUN bash /root/05_rust.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org