mesatee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From din...@apache.org
Subject [incubator-mesatee-sgx] branch v1.1.0-beta updated: Update 1.1.0 dockerfile
Date Thu, 21 Nov 2019 21:43:11 GMT
This is an automated email from the ASF dual-hosted git repository.

dingyu pushed a commit to branch v1.1.0-beta
in repository https://gitbox.apache.org/repos/asf/incubator-mesatee-sgx.git


The following commit(s) were added to refs/heads/v1.1.0-beta by this push:
     new 1d7b831  Update 1.1.0 dockerfile
1d7b831 is described below

commit 1d7b831095d8f02cb4ff9e6acc3f871df94600cb
Author: Yu Ding <dingelish@gmail.com>
AuthorDate: Thu Nov 21 13:43:01 2019 -0800

    Update 1.1.0 dockerfile
---
 dockerfile/Dockerfile.1604.nightly     |  8 ++--
 dockerfile/Dockerfile.1604.stable      | 75 -------------------------------
 dockerfile/Dockerfile.1804.nightly     | 10 ++---
 dockerfile/Dockerfile.1804.stable      | 80 ----------------------------------
 dockerfile/Dockerfile.centos7.nightly  | 10 ++---
 dockerfile/Dockerfile.fedora27.nightly | 10 ++---
 6 files changed, 19 insertions(+), 174 deletions(-)

diff --git a/dockerfile/Dockerfile.1604.nightly b/dockerfile/Dockerfile.1604.nightly
index db05cb3..05cec5f 100644
--- a/dockerfile/Dockerfile.1604.nightly
+++ b/dockerfile/Dockerfile.1604.nightly
@@ -32,10 +32,10 @@
 FROM ubuntu:16.04
 MAINTAINER Yu Ding
 
-ENV sdk_bin https://download.01.org/intel-sgx/linux-2.6/ubuntu16.04-server/sgx_linux_x64_sdk_2.6.100.51363.bin
-ENV psw_deb https://download.01.org/intel-sgx/linux-2.6/ubuntu16.04-server/libsgx-enclave-common_2.6.100.51363-xenial1_amd64.deb
-ENV psw_dev_deb https://download.01.org/intel-sgx/linux-2.6/ubuntu16.04-server/libsgx-enclave-common-dev_2.6.100.51363-xenial1_amd64.deb
-ENV rust_toolchain nightly-2019-08-01
+ENV sdk_bin https://download.01.org/intel-sgx/sgx-linux/2.7.1/distro/ubuntu16.04-server/sgx_linux_x64_sdk_2.7.101.3.bin
+ENV psw_deb https://download.01.org/intel-sgx/sgx-linux/2.7.1/distro/ubuntu16.04-server/libsgx-enclave-common_2.7.101.3-xenial1_amd64.deb
+ENV psw_dev_deb https://download.01.org/intel-sgx/sgx-linux/2.7.1/distro/ubuntu16.04-server/libsgx-enclave-common-dev_2.7.101.3-xenial1_amd64.deb
+ENV rust_toolchain nightly-2019-11-06
 
 RUN apt-get update && \
     apt-get install -y build-essential ocaml automake autoconf libtool wget python libssl-dev
libcurl4-openssl-dev protobuf-compiler libprotobuf-dev sudo kmod vim curl git-core libprotobuf-c0-dev
libboost-thread-dev libboost-system-dev liblog4cpp5-dev libjsoncpp-dev alien uuid-dev libxml2-dev
cmake pkg-config expect gdb && \
diff --git a/dockerfile/Dockerfile.1604.stable b/dockerfile/Dockerfile.1604.stable
deleted file mode 100644
index 2f5ddad..0000000
--- a/dockerfile/Dockerfile.1604.stable
+++ /dev/null
@@ -1,75 +0,0 @@
-# BSD License
-#
-# Copyright (C) 2017-2019 Baidu, Inc. All Rights Reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   * Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#   * Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in
-#     the documentation and/or other materials provided with the
-#     distribution.
-#   * Neither the name of Baidu, Inc., nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-FROM ubuntu:16.04
-MAINTAINER Yu Ding
-
-ENV sdk_bin https://download.01.org/intel-sgx/linux-2.6/ubuntu16.04-server/sgx_linux_x64_sdk_2.6.100.51363.bin
-ENV psw_deb https://download.01.org/intel-sgx/linux-2.6/ubuntu16.04-server/libsgx-enclave-common_2.6.100.51363-xenial1_amd64.deb
-ENV psw_dev_deb https://download.01.org/intel-sgx/linux-2.6/ubuntu16.04-server/libsgx-enclave-common-dev_2.6.100.51363-xenial1_amd64.deb
-ENV rust_toolchain stable-2019-05-14
-
-RUN apt-get update && \
-    apt-get install -y build-essential ocaml automake autoconf libtool wget python libssl-dev
libcurl4-openssl-dev protobuf-compiler libprotobuf-dev sudo kmod vim curl git-core libprotobuf-c0-dev
libboost-thread-dev libboost-system-dev liblog4cpp5-dev libjsoncpp-dev alien uuid-dev libxml2-dev
cmake pkg-config expect gdb && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /var/cache/apt/archives/*
-
-
-# Uncomment the following lines for setup iCls
-# Make sure you have put the installer file in this directory with filename iclsClient-1.45.449.12-1.x86_64.rpm
-#RUN mkdir /root/icls
-#ADD iclsClient-1.45.449.12-1.x86_64.rpm /root/icls/
-#RUN cd /root/icls && alien --scripts iclsClient-1.45.449.12-1.x86_64.rpm &&
dpkg -i iclsclient_1.45.449.12-2_amd64.deb && ldconfig && \
-#    cd /tmp && \
-#    git clone https://github.com/01org/dynamic-application-loader-host-interface.git jhi
&& \
-#    cd jhi && mkdir build && cd build && cmake .. && make
&& make install && \
-#    systemctl enable jhi
-
-RUN mkdir /root/sgx && \
-    wget -O /root/sgx/psw.deb ${psw_deb} && \
-    wget -O /root/sgx/psw_dev.deb ${psw_dev_deb} && \
-    wget -O /root/sgx/sdk.bin ${sdk_bin} && \
-    cd /root/sgx && \
-    dpkg -i /root/sgx/psw.deb && \
-    dpkg -i /root/sgx/psw_dev.deb && \
-    chmod +x /root/sgx/sdk.bin && \
-    echo -e 'no\n/opt' | /root/sgx/sdk.bin && \
-    echo 'source /opt/sgxsdk/environment' >> /root/.bashrc && \
-    rm -rf /root/sgx/*
-
-RUN wget 'https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init'
-O /root/rustup-init && \
-    chmod +x /root/rustup-init && \
-    echo '1' | /root/rustup-init --default-toolchain ${rust_toolchain} && \
-    echo 'source /root/.cargo/env' >> /root/.bashrc && \
-    /root/.cargo/bin/rustup component add rust-src rls rust-analysis clippy rustfmt &&
\
-    /root/.cargo/bin/cargo install xargo && \
-    rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git
-WORKDIR /root
diff --git a/dockerfile/Dockerfile.1804.nightly b/dockerfile/Dockerfile.1804.nightly
index f7f6cd9..90d7888 100644
--- a/dockerfile/Dockerfile.1804.nightly
+++ b/dockerfile/Dockerfile.1804.nightly
@@ -32,11 +32,11 @@
 FROM ubuntu:18.04
 MAINTAINER Yu Ding
 
-ENV sdk_bin https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server/sgx_linux_x64_sdk_2.6.100.51363.bin
-ENV psw_deb https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server/libsgx-enclave-common_2.6.100.51363-bionic1_amd64.deb
-ENV psw_dev_deb https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server/libsgx-enclave-common-dev_2.6.100.51363-bionic1_amd64.deb
-ENV psw_dbgsym_deb https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server/libsgx-enclave-common-dbgsym_2.6.100.51363-bionic1_amd64.ddeb
-ENV rust_toolchain nightly-2019-08-01
+ENV sdk_bin https://download.01.org/intel-sgx/sgx-linux/2.7.1/distro/ubuntu18.04-server/sgx_linux_x64_sdk_2.7.101.3.bin
+ENV psw_deb https://download.01.org/intel-sgx/sgx-linux/2.7.1/distro/ubuntu18.04-server/libsgx-enclave-common_2.7.101.3-bionic1_amd64.deb
+ENV psw_dev_deb https://download.01.org/intel-sgx/sgx-linux/2.7.1/distro/ubuntu18.04-server/libsgx-enclave-common-dev_2.7.101.3-bionic1_amd64.deb
+ENV psw_dbgsym_deb https://download.01.org/intel-sgx/sgx-linux/2.7.1/distro/ubuntu18.04-server/libsgx-enclave-common-dbgsym_2.7.101.3-bionic1_amd64.ddeb
+ENV rust_toolchain nightly-2019-11-06
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
diff --git a/dockerfile/Dockerfile.1804.stable b/dockerfile/Dockerfile.1804.stable
deleted file mode 100644
index 4502bba..0000000
--- a/dockerfile/Dockerfile.1804.stable
+++ /dev/null
@@ -1,80 +0,0 @@
-# BSD License
-#
-# Copyright (C) 2017-2019 Baidu, Inc. All Rights Reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   * Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#   * Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in
-#     the documentation and/or other materials provided with the
-#     distribution.
-#   * Neither the name of Baidu, Inc., nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-FROM ubuntu:18.04
-MAINTAINER Yu Ding
-
-ENV sdk_bin https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server/sgx_linux_x64_sdk_2.6.100.51363.bin
-ENV psw_deb https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server/libsgx-enclave-common_2.6.100.51363-bionic1_amd64.deb
-ENV psw_dev_deb https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server/libsgx-enclave-common-dev_2.6.100.51363-bionic1_amd64.deb
-ENV psw_dbgsym_deb https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server/libsgx-enclave-common-dbgsym_2.6.100.51363-bionic1_amd64.ddeb
-ENV rust_toolchain stable-2019-05-14
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && \
-    apt-get install -y build-essential ocaml ocamlbuild automake autoconf libtool wget python
libssl-dev libcurl4-openssl-dev protobuf-compiler libprotobuf-dev sudo kmod vim curl git-core
libprotobuf-c0-dev libboost-thread-dev libboost-system-dev liblog4cpp5-dev libjsoncpp-dev
alien uuid-dev libxml2-dev cmake pkg-config expect systemd-sysv gdb && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /var/cache/apt/archives/*
-
-
-# Uncomment the following lines for setup iCls
-# Make sure you have put the installer file in this directory with filename iclsClient-1.45.449.12-1.x86_64.rpm
-#RUN mkdir /root/icls
-#ADD iclsClient-1.45.449.12-1.x86_64.rpm /root/icls/
-#RUN cd /root/icls && alien --scripts iclsClient-1.45.449.12-1.x86_64.rpm &&
dpkg -i iclsclient_1.45.449.12-2_amd64.deb && ldconfig && \
-#    cd /tmp && \
-#    git clone https://github.com/01org/dynamic-application-loader-host-interface.git jhi
&& \
-#    cd jhi && mkdir build && cd build && cmake .. && make
&& make install && \
-#    systemctl enable jhi
-
-RUN mkdir /root/sgx && \
-    mkdir /etc/init && \
-    wget -O /root/sgx/psw.deb ${psw_deb} && \
-    wget -O /root/sgx/psw_dev.deb ${psw_dev_deb} && \
-    wget -O /root/sgx/psw_dbgsym.deb ${psw_dbgsym_deb} && \
-    wget -O /root/sgx/sdk.bin ${sdk_bin} && \
-    cd /root/sgx && \
-    dpkg -i /root/sgx/psw.deb && \
-    dpkg -i /root/sgx/psw_dev.deb && \
-    dpkg -i /root/sgx/psw_dbgsym.deb && \
-    chmod +x /root/sgx/sdk.bin && \
-    echo -e 'no\n/opt' | /root/sgx/sdk.bin && \
-    echo 'source /opt/sgxsdk/environment' >> /root/.bashrc && \
-    rm -rf /root/sgx/*
-
-RUN wget 'https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init'
-O /root/rustup-init && \
-    chmod +x /root/rustup-init && \
-    echo '1' | /root/rustup-init --default-toolchain ${rust_toolchain} && \
-    echo 'source /root/.cargo/env' >> /root/.bashrc && \
-    /root/.cargo/bin/rustup component add rust-src rustfmt && \
-    /root/.cargo/bin/cargo install xargo && \
-    rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git
-WORKDIR /root
diff --git a/dockerfile/Dockerfile.centos7.nightly b/dockerfile/Dockerfile.centos7.nightly
index e5f2c7b..1763e9e 100644
--- a/dockerfile/Dockerfile.centos7.nightly
+++ b/dockerfile/Dockerfile.centos7.nightly
@@ -32,16 +32,16 @@
 FROM centos:7
 MAINTAINER Yu Ding
 
-ENV sdk_bin https://download.01.org/intel-sgx/latest/linux-latest/distro/centos7.5-server/sgx_linux_x64_sdk_2.7.100.4.bin
-ENV psw_deb https://download.01.org/intel-sgx/latest/linux-latest/distro/centos7.5-server/sgx_linux_x64_psw_2.7.100.4.bin
-ENV rust_toolchain nightly-2019-10-14
+ENV sdk_bin https://download.01.org/intel-sgx/sgx-linux/2.7.1/distro/centos7.5-server/sgx_linux_x64_sdk_2.7.101.3.bin
+ENV psw_bin https://download.01.org/intel-sgx/sgx-linux/2.7.1/distro/centos7.5-server/sgx_linux_x64_psw_2.7.101.3.bin
+ENV rust_toolchain nightly-2019-11-06
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN yum groupinstall -y 'Development Tools' && yum install -y ocaml ocaml-ocamlbuild
wget python openssl-devel protobuf which
+RUN yum groupinstall -y 'Development Tools' && yum install -y ocaml ocaml-ocamlbuild
wget python openssl-devel protobuf which git
 
 RUN mkdir /root/sgx && \
     mkdir /etc/init && \
-    wget -O /root/sgx/psw.bin ${psw_deb} && \
+    wget -O /root/sgx/psw.bin ${psw_bin} && \
     wget -O /root/sgx/sdk.bin ${sdk_bin} && \
     cd /root/sgx && \
     chmod +x /root/sgx/psw.bin && \
diff --git a/dockerfile/Dockerfile.fedora27.nightly b/dockerfile/Dockerfile.fedora27.nightly
index b5e1b8a..54c7c4e 100644
--- a/dockerfile/Dockerfile.fedora27.nightly
+++ b/dockerfile/Dockerfile.fedora27.nightly
@@ -32,16 +32,16 @@
 FROM fedora:27
 MAINTAINER Yu Ding
 
-ENV sdk_bin https://download.01.org/intel-sgx/latest/linux-latest/distro/fedora27-server/sgx_linux_x64_sdk_2.7.100.4.bin
-ENV psw_deb https://download.01.org/intel-sgx/latest/linux-latest/distro/fedora27-server/sgx_linux_x64_psw_2.7.100.4.bin
-ENV rust_toolchain nightly-2019-08-01
+ENV sdk_bin https://download.01.org/intel-sgx/sgx-linux/2.7.1/distro/fedora27-server/sgx_linux_x64_sdk_2.7.101.3.bin
+ENV psw_bin https://download.01.org/intel-sgx/sgx-linux/2.7.1/distro/fedora27-server/sgx_linux_x64_psw_2.7.101.3.bin
+ENV rust_toolchain nightly-2019-11-06
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN yum groupinstall -y 'C Development Tools and Libraries' && yum install -y yum
openssl-devel libcurl-devel protobuf-devel cmake ocaml ocaml-ocamlbuild redhat-rpm-config
openssl-devel wget python
+RUN yum groupinstall -y 'C Development Tools and Libraries' && yum install -y yum
openssl-devel libcurl-devel protobuf-devel cmake ocaml ocaml-ocamlbuild redhat-rpm-config
openssl-devel wget python git
 
 RUN mkdir /root/sgx && \
     mkdir /etc/init && \
-    wget -O /root/sgx/psw.bin ${psw_deb} && \
+    wget -O /root/sgx/psw.bin ${psw_bin} && \
     wget -O /root/sgx/sdk.bin ${sdk_bin} && \
     cd /root/sgx && \
     chmod +x /root/sgx/psw.bin && \


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@mesatee.apache.org
For additional commands, e-mail: commits-help@mesatee.apache.org


Mime
View raw message