teaclave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ms...@apache.org
Subject [incubator-mesatee] branch master updated: [docker] Add Dockerfile for build and runtime based on Ubuntu 16.04 (#118)
Date Wed, 04 Dec 2019 03:39:47 GMT
This is an automated email from the ASF dual-hosted git repository.

mssun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mesatee.git


The following commit(s) were added to refs/heads/master by this push:
     new a027da6  [docker] Add Dockerfile for build and runtime based on Ubuntu 16.04 (#118)
a027da6 is described below

commit a027da6eb1308e77128d2ece94942f31d81d0e5a
Author: Mingshen Sun <bob@mssun.me>
AuthorDate: Tue Dec 3 19:39:42 2019 -0800

    [docker] Add Dockerfile for build and runtime based on Ubuntu 16.04 (#118)
---
 .drone.yml                                         | 265 ++++++++++++++++++---
 ...ckerfile.build => build.ubuntu-1604.Dockerfile} |  78 +++---
 ...ckerfile.build => build.ubuntu-1804.Dockerfile} |  55 ++---
 ...-compose.yml => docker-compose-ubuntu-1604.yml} |   8 +-
 ...-compose.yml => docker-compose-ubuntu-1804.yml} |   8 +-
 ...e.runtime.fns => fns-rt.ubuntu-1604.Dockerfile} |   6 +-
 ...e.runtime.fns => fns-rt.ubuntu-1804.Dockerfile} |   2 -
 ...e.runtime.kms => kms-rt.ubuntu-1604.Dockerfile} |   8 +-
 ...e.runtime.kms => kms-rt.ubuntu-1804.Dockerfile} |   2 -
 ...runtime.tdfs => tdfs-rt.ubuntu-1604.Dockerfile} |   8 +-
 ...runtime.tdfs => tdfs-rt.ubuntu-1804.Dockerfile} |   2 -
 ...e.runtime.tms => tms-rt.ubuntu-1604.Dockerfile} |   8 +-
 ...e.runtime.tms => tms-rt.ubuntu-1804.Dockerfile} |   2 -
 .../protected_fs_rs/protected_fs_c/build.sh        |   2 +-
 14 files changed, 305 insertions(+), 149 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f77176c..51519aa 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,26 +1,26 @@
 kind: pipeline
-name: sgx-debug
+name: sgx-debug-ubuntu-1804
 
 steps:
 - name: prepare
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake -DCMAKE_BUILD_TYPE=Debug ..
 - name: check
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: compile
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - export RUSTFLAGS="-D warnings"
   - cd build && make VERBOSE=1 -j2
 - name: sgx-test
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   environment:
     IAS_KEY:
       from_secret: V5_KEY
@@ -50,28 +50,28 @@ node:
 ---
 
 kind: pipeline
-name: sgx-release
+name: sgx-release-ubuntu-1804
 
 steps:
 - name: prepare
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake ..
 - name: check
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: compile
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - export RUSTFLAGS="-D warnings"
   - cd build && make VERBOSE=1 -j2
 - name: sgx-test
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   privileged: true
   environment:
     IAS_KEY:
@@ -101,27 +101,27 @@ node:
 ---
 
 kind: pipeline
-name: sim_debug
+name: sim-debug-ubuntu-1804
 
 steps:
 - name: prepare
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake ..
 - name: check
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: compile
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DRUSTFLAGS="-D warnings" -DSGX_MODE=SW
.. && make VERBOSE=1 -j2
 - name: sgx-test
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - cd build && make sgx-test
@@ -146,27 +146,220 @@ node:
 ---
 
 kind: pipeline
-name: sim_release
+name: sim-release-ubuntu-1804
 
 steps:
 - name: prepare
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake ..
 - name: check
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: compile
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - cd build && cmake -DRUSTFLAGS="-D warnings" -DSGX_MODE=SW .. && make
VERBOSE=1 -j2
 - name: sgx-test
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - cd build && make sgx-test
+  privileged: true
+  volumes:
+  - name: isgx
+    path: /dev/isgx
+  - name: aesmd
+    path: /var/run/aesmd/aesm.socket
+
+volumes:
+- name: isgx
+  host:
+    path: /dev/isgx
+- name: aesmd
+  host:
+    path: /var/run/aesmd/aesm.socket
+
+
+node:
+  instance: mesatee-sgx
+
+---
+
+kind: pipeline
+name: sgx-debug-ubuntu-1604
+
+steps:
+- name: prepare
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - mkdir -p build
+  - cd build && cmake -DCMAKE_BUILD_TYPE=Debug ..
+- name: check
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - cd build && make check
+- name: compile
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - export RUSTFLAGS="-D warnings"
+  - cd build && make VERBOSE=1 -j2
+- name: sgx-test
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  environment:
+    IAS_KEY:
+      from_secret: V5_KEY
+    IAS_SPID:
+      from_secret: V5_SPID
+  privileged: true
+  volumes:
+  - name: isgx
+    path: /dev/isgx
+  - name: aesmd
+    path: /var/run/aesmd/aesm.socket
+  commands:
+  - . /root/.cargo/env
+  - cd build && make sgx-test
+
+volumes:
+- name: isgx
+  host:
+    path: /dev/isgx
+- name: aesmd
+  host:
+    path: /var/run/aesmd/aesm.socket
+
+node:
+  instance: mesatee-sgx
+
+---
+
+kind: pipeline
+name: sgx-release-ubuntu-1604
+
+steps:
+- name: prepare
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - mkdir -p build
+  - cd build && cmake ..
+- name: check
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - cd build && make check
+- name: compile
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - export RUSTFLAGS="-D warnings"
+  - cd build && make VERBOSE=1 -j2
+- name: sgx-test
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  privileged: true
+  environment:
+    IAS_KEY:
+      from_secret: V5_KEY
+    IAS_SPID:
+      from_secret: V5_SPID
+  volumes:
+  - name: isgx
+    path: /dev/isgx
+  - name: aesmd
+    path: /var/run/aesmd/aesm.socket
+  commands:
+  - . /root/.cargo/env
+  - cd build && make sgx-test
+
+volumes:
+- name: isgx
+  host:
+    path: /dev/isgx
+- name: aesmd
+  host:
+    path: /var/run/aesmd/aesm.socket
+
+node:
+  instance: mesatee-sgx
+
+---
+
+kind: pipeline
+name: sim-debug-ubuntu-1604
+
+steps:
+- name: prepare
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - mkdir -p build
+  - cd build && cmake ..
+- name: check
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - cd build && make check
+- name: compile
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DRUSTFLAGS="-D warnings" -DSGX_MODE=SW
.. && make VERBOSE=1 -j2
+- name: sgx-test
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - cd build && make sgx-test
+  privileged: true
+  volumes:
+  - name: isgx
+    path: /dev/isgx
+  - name: aesmd
+    path: /var/run/aesmd/aesm.socket
+
+volumes:
+- name: isgx
+  host:
+    path: /dev/isgx
+- name: aesmd
+  host:
+    path: /var/run/aesmd/aesm.socket
+
+node:
+  instance: mesatee-sgx
+
+---
+
+kind: pipeline
+name: sim-release-ubuntu-1604
+
+steps:
+- name: prepare
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - mkdir -p build
+  - cd build && cmake ..
+- name: check
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - cd build && make check
+- name: compile
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
+  commands:
+  - . /root/.cargo/env
+  - cd build && cmake -DRUSTFLAGS="-D warnings" -DSGX_MODE=SW .. && make
VERBOSE=1 -j2
+- name: sgx-test
+  image: mesalocklinux/mesatee-build-ubuntu-1604:0.1.1
   commands:
   - . /root/.cargo/env
   - cd build && make sgx-test
@@ -196,18 +389,18 @@ name: lint
 
 steps:
 - name: prepare
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake ..
 - name: check
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: clippy
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - cd build && make CLP=1
@@ -222,24 +415,24 @@ name: coverage
 
 steps:
 - name: prepare
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake -DCMAKE_BUILD_TYPE=DEBUG -DCOV=1 ..
 - name: check
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: compile
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - export RUSTFLAGS="-D warnings"
   - cd build && make VERBOSE=1 -j2
 - name: sgx-test
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   environment:
     IAS_KEY:
       from_secret: V5_KEY
@@ -256,7 +449,7 @@ steps:
   - cd build && make sgx-test
 - name: coverage
   failure: ignore
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - cd build && make cov
   - bash -c "bash <(curl -s https://codecov.io/bash) -f intermediate/cov.info"
@@ -288,13 +481,13 @@ name: doc
 
 steps:
 - name: prepare
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake ..
 - name: doc
-  image: mesalocklinux/build-mesatee:0.1.5
+  image: mesalocklinux/mesatee-build-ubuntu-1804:0.1.1
   failure: ignore
   commands:
   - . /root/.cargo/env
@@ -353,10 +546,14 @@ trigger:
       - hourly
 
 depends_on:
-  - sgx-debug
-  - sgx-release
-  - sim_debug
-  - sim_release
+  - sgx-debug-ubuntu-1804
+  - sgx-release-ubuntu-1804
+  - sim-debug-ubuntu-1804
+  - sim-release-ubuntu-1804
+  - sgx-debug-ubuntu-1604
+  - sgx-release-ubuntu-1604
+  - sim-debug-ubuntu-1604
+  - sim-release-ubuntu-1604
   - lint
 
 node:
diff --git a/docker/Dockerfile.build b/docker/build.ubuntu-1604.Dockerfile
similarity index 64%
copy from docker/Dockerfile.build
copy to docker/build.ubuntu-1604.Dockerfile
index 707d6e7..dafd594 100644
--- a/docker/Dockerfile.build
+++ b/docker/build.ubuntu-1604.Dockerfile
@@ -1,16 +1,14 @@
-FROM ubuntu:18.04
+FROM ubuntu:16.04
 
-ENV SGX_DOWNLOAD_URL_BASE "https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server"
+ENV SGX_DOWNLOAD_URL_BASE "https://download.01.org/intel-sgx/linux-2.6/ubuntu16.04-server"
 
 ENV SGX_LINUX_X64_SDK            sgx_linux_x64_sdk_2.6.100.51363.bin
-ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-bionic1_amd64.deb
-ENV LIBSGX_ENCLAVE_COMMON_DEV    libsgx-enclave-common-dev_2.6.100.51363-bionic1_amd64.deb
-ENV LIBSGX_ENCLAVE_COMMON_DBGSYM libsgx-enclave-common-dbgsym_2.6.100.51363-bionic1_amd64.ddeb
+ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-xenial1_amd64.deb
+ENV LIBSGX_ENCLAVE_COMMON_DEV    libsgx-enclave-common-dev_2.6.100.51363-xenial1_amd64.deb
 
 ENV SGX_LINUX_X64_SDK_URL            "$SGX_DOWNLOAD_URL_BASE/$SGX_LINUX_X64_SDK"
 ENV LIBSGX_ENCLAVE_COMMON_URL        "$SGX_DOWNLOAD_URL_BASE/$LIBSGX_ENCLAVE_COMMON"
 ENV LIBSGX_ENCLAVE_COMMON_DEV_URL    "$SGX_DOWNLOAD_URL_BASE/$LIBSGX_ENCLAVE_COMMON_DEV"
-ENV LIBSGX_ENCLAVE_COMMON_DBGSYM_URL "$SGX_DOWNLOAD_URL_BASE/$LIBSGX_ENCLAVE_COMMON_DBGSYM"
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -20,67 +18,57 @@ ENV RUST_TOOLCHAIN nightly-2019-08-01
 RUN apt-get update && apt-get install -q -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
-
-# install other dependencies
-RUN apt-get update && apt-get install -q -y \
-    pypy \
-    pypy-dev
+    libcurl3 \
+    libprotobuf9v5
 
 RUN mkdir ~/sgx                                                               &&
\
-    mkdir /etc/init                                                           &&
\
     cd ~/sgx                                                                  &&
\
     wget -O $LIBSGX_ENCLAVE_COMMON        "$LIBSGX_ENCLAVE_COMMON_URL"        &&
\
     wget -O $LIBSGX_ENCLAVE_COMMON_DEV    "$LIBSGX_ENCLAVE_COMMON_DEV_URL"    &&
\
-    wget -O $LIBSGX_ENCLAVE_COMMON_DBGSYM "$LIBSGX_ENCLAVE_COMMON_DBGSYM_URL" &&
\
     wget -O $SGX_LINUX_X64_SDK            "$SGX_LINUX_X64_SDK_URL"
 
 RUN cd ~/sgx                                  && \
     dpkg -i $LIBSGX_ENCLAVE_COMMON            && \
     dpkg -i $LIBSGX_ENCLAVE_COMMON_DEV        && \
-    dpkg -i $LIBSGX_ENCLAVE_COMMON_DBGSYM     && \
     chmod u+x $SGX_LINUX_X64_SDK              && \
     echo -e 'no\n/opt' | ./$SGX_LINUX_X64_SDK && \
     echo 'source /opt/sgxsdk/environment' >> ~/.bashrc
 
-# install Rust
+RUN rm -rf ~/sgx
 
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
-    . $HOME/.cargo/env                                                      && \
-    rustup default $RUST_TOOLCHAIN                                          && \
-    rustup component add rust-src rls rust-analysis clippy rustfmt          && \
-    rustup target install aarch64-unknown-linux-gnu                         && \
-    cargo install xargo                                                     && \
-    cargo install sccache                                                   && \
+# install Rust and its dependencies
+
+RUN apt-get update && apt-get install -q -y curl pkg-config
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y   &&
\
+    . $HOME/.cargo/env                                                        &&
\
+    rustup default $RUST_TOOLCHAIN                                            &&
\
+    rustup component add rust-src rls rust-analysis clippy rustfmt            &&
\
+    echo 'source $HOME/.cargo/env' >> ~/.bashrc                               &&
\
+    cargo install xargo                                                       &&
\
     rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git
 
+# install other dependencies for building
+
+RUN apt-get update && apt-get install -q -y \
+    software-properties-common \
+    apt-transport-https \
+    ca-certificates \
+    git \
+    pypy \
+    pypy-dev
+
+RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key
add - && \
+    apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main' && \
+    apt-get update && \
+    apt-get install -q -y cmake
+
 # install dependencies for testing and coverage
 
 RUN apt-get update && apt-get install -q -y \
@@ -93,4 +81,4 @@ RUN apt-get update && apt-get install -q -y \
 # clean up apt caches
 
 RUN apt-get clean && \
-  rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
+    rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/docker/Dockerfile.build b/docker/build.ubuntu-1804.Dockerfile
similarity index 80%
rename from docker/Dockerfile.build
rename to docker/build.ubuntu-1804.Dockerfile
index 707d6e7..ead80dc 100644
--- a/docker/Dockerfile.build
+++ b/docker/build.ubuntu-1804.Dockerfile
@@ -28,31 +28,7 @@ RUN apt-get update && apt-get install -q -y \
     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
-
-# install other dependencies
-RUN apt-get update && apt-get install -q -y \
-    pypy \
-    pypy-dev
+    libprotobuf-dev
 
 RUN mkdir ~/sgx                                                               &&
\
     mkdir /etc/init                                                           &&
\
@@ -70,17 +46,28 @@ RUN cd ~/sgx                                  && \
     echo -e 'no\n/opt' | ./$SGX_LINUX_X64_SDK && \
     echo 'source /opt/sgxsdk/environment' >> ~/.bashrc
 
-# install Rust
+RUN rm -rf ~/sgx
+
+# install Rust and its dependencies
+
+RUN apt-get update && apt-get install -q -y curl pkg-config
 
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
-    . $HOME/.cargo/env                                                      && \
-    rustup default $RUST_TOOLCHAIN                                          && \
-    rustup component add rust-src rls rust-analysis clippy rustfmt          && \
-    rustup target install aarch64-unknown-linux-gnu                         && \
-    cargo install xargo                                                     && \
-    cargo install sccache                                                   && \
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y   &&
\
+    . $HOME/.cargo/env                                                        &&
\
+    rustup default $RUST_TOOLCHAIN                                            &&
\
+    rustup component add rust-src rls rust-analysis clippy rustfmt            &&
\
+    echo 'source $HOME/.cargo/env' >> ~/.bashrc                               &&
\
+    cargo install xargo                                                       &&
\
     rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git
 
+# install other dependencies for building
+
+RUN apt-get update && apt-get install -q -y \
+    git \
+    cmake \
+    pypy \
+    pypy-dev
+
 # install dependencies for testing and coverage
 
 RUN apt-get update && apt-get install -q -y \
@@ -93,4 +80,4 @@ RUN apt-get update && apt-get install -q -y \
 # clean up apt caches
 
 RUN apt-get clean && \
-  rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
+    rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/docker/docker-compose.yml b/docker/docker-compose-ubuntu-1604.yml
similarity index 91%
copy from docker/docker-compose.yml
copy to docker/docker-compose-ubuntu-1604.yml
index 8b2e99b..4f24889 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose-ubuntu-1604.yml
@@ -4,7 +4,7 @@ services:
   mesatee-tms:
     build:
       context: ../
-      dockerfile: docker/Dockerfile.runtime.tms
+      dockerfile: docker/tms-rt.ubuntu-1604.Dockerfile
     ports:
       - 5554:5554
     expose:
@@ -29,7 +29,7 @@ services:
   mesatee-tdfs:
     build:
       context: ../
-      dockerfile: docker/Dockerfile.runtime.tdfs
+      dockerfile: docker/tdfs-rt.ubuntu-1604.Dockerfile
     ports:
       - 5065:5065
     expose:
@@ -58,7 +58,7 @@ services:
   mesatee-fns:
     build:
       context: ../
-      dockerfile: docker/Dockerfile.runtime.fns
+      dockerfile: docker/fns-rt.ubuntu-1604.Dockerfile
     ports:
       - 3444:3444
     volumes:
@@ -85,7 +85,7 @@ services:
   mesatee-kms:
     build:
       context: ../
-      dockerfile: docker/Dockerfile.runtime.kms
+      dockerfile: docker/kms-rt.ubuntu-1604.Dockerfile
     expose:
       - 6016
     volumes:
diff --git a/docker/docker-compose.yml b/docker/docker-compose-ubuntu-1804.yml
similarity index 91%
rename from docker/docker-compose.yml
rename to docker/docker-compose-ubuntu-1804.yml
index 8b2e99b..5f6324f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose-ubuntu-1804.yml
@@ -4,7 +4,7 @@ services:
   mesatee-tms:
     build:
       context: ../
-      dockerfile: docker/Dockerfile.runtime.tms
+      dockerfile: docker/tms-rt.ubuntu-1804.Dockerfile
     ports:
       - 5554:5554
     expose:
@@ -29,7 +29,7 @@ services:
   mesatee-tdfs:
     build:
       context: ../
-      dockerfile: docker/Dockerfile.runtime.tdfs
+      dockerfile: docker/tdfs-rt.ubuntu-1804.Dockerfile
     ports:
       - 5065:5065
     expose:
@@ -58,7 +58,7 @@ services:
   mesatee-fns:
     build:
       context: ../
-      dockerfile: docker/Dockerfile.runtime.fns
+      dockerfile: docker/fns-rt.ubuntu-1804.Dockerfile
     ports:
       - 3444:3444
     volumes:
@@ -85,7 +85,7 @@ services:
   mesatee-kms:
     build:
       context: ../
-      dockerfile: docker/Dockerfile.runtime.kms
+      dockerfile: docker/kms-rt.ubuntu-1804.Dockerfile
     expose:
       - 6016
     volumes:
diff --git a/docker/Dockerfile.runtime.fns b/docker/fns-rt.ubuntu-1604.Dockerfile
similarity index 91%
copy from docker/Dockerfile.runtime.fns
copy to docker/fns-rt.ubuntu-1604.Dockerfile
index 51fad65..0d40a30 100644
--- a/docker/Dockerfile.runtime.fns
+++ b/docker/fns-rt.ubuntu-1604.Dockerfile
@@ -5,10 +5,8 @@ ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-bionic1_amd
 ENV LIBSGX_ENCLAVE_COMMON_URL    "$SGX_DOWNLOAD_URL_BASE/$LIBSGX_ENCLAVE_COMMON"
 
 RUN apt-get update && apt-get install -q -y \
-    lsof \
-    wget \
-    libcurl4-openssl-dev \
-    libprotobuf-dev
+    libcurl3 \
+    libprotobuf9v5
 
 RUN wget -O $LIBSGX_ENCLAVE_COMMON "$LIBSGX_ENCLAVE_COMMON_URL" && \
     mkdir /etc/init                                             && \
diff --git a/docker/Dockerfile.runtime.fns b/docker/fns-rt.ubuntu-1804.Dockerfile
similarity index 97%
rename from docker/Dockerfile.runtime.fns
rename to docker/fns-rt.ubuntu-1804.Dockerfile
index 51fad65..2cb145f 100644
--- a/docker/Dockerfile.runtime.fns
+++ b/docker/fns-rt.ubuntu-1804.Dockerfile
@@ -5,8 +5,6 @@ ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-bionic1_amd
 ENV LIBSGX_ENCLAVE_COMMON_URL    "$SGX_DOWNLOAD_URL_BASE/$LIBSGX_ENCLAVE_COMMON"
 
 RUN apt-get update && apt-get install -q -y \
-    lsof \
-    wget \
     libcurl4-openssl-dev \
     libprotobuf-dev
 
diff --git a/docker/Dockerfile.runtime.kms b/docker/kms-rt.ubuntu-1604.Dockerfile
similarity index 89%
copy from docker/Dockerfile.runtime.kms
copy to docker/kms-rt.ubuntu-1604.Dockerfile
index 34a26e5..a9dc8db 100644
--- a/docker/Dockerfile.runtime.kms
+++ b/docker/kms-rt.ubuntu-1604.Dockerfile
@@ -1,14 +1,12 @@
 FROM ubuntu:18.04
 
 ENV SGX_DOWNLOAD_URL_BASE "https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server"
-ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-bionic1_amd64.deb
+ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-xenial1_amd64.deb
 ENV LIBSGX_ENCLAVE_COMMON_URL    "$SGX_DOWNLOAD_URL_BASE/$LIBSGX_ENCLAVE_COMMON"
 
 RUN apt-get update && apt-get install -q -y \
-    lsof \
-    wget \
-    libcurl4-openssl-dev \
-    libprotobuf-dev
+    libcurl3 \
+    libprotobuf9v5
 
 RUN wget -O $LIBSGX_ENCLAVE_COMMON "$LIBSGX_ENCLAVE_COMMON_URL" && \
     mkdir /etc/init                                             && \
diff --git a/docker/Dockerfile.runtime.kms b/docker/kms-rt.ubuntu-1804.Dockerfile
similarity index 97%
rename from docker/Dockerfile.runtime.kms
rename to docker/kms-rt.ubuntu-1804.Dockerfile
index 34a26e5..5ac6c04 100644
--- a/docker/Dockerfile.runtime.kms
+++ b/docker/kms-rt.ubuntu-1804.Dockerfile
@@ -5,8 +5,6 @@ ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-bionic1_amd
 ENV LIBSGX_ENCLAVE_COMMON_URL    "$SGX_DOWNLOAD_URL_BASE/$LIBSGX_ENCLAVE_COMMON"
 
 RUN apt-get update && apt-get install -q -y \
-    lsof \
-    wget \
     libcurl4-openssl-dev \
     libprotobuf-dev
 
diff --git a/docker/Dockerfile.runtime.tdfs b/docker/tdfs-rt.ubuntu-1604.Dockerfile
similarity index 89%
copy from docker/Dockerfile.runtime.tdfs
copy to docker/tdfs-rt.ubuntu-1604.Dockerfile
index f5eda67..e5d2018 100644
--- a/docker/Dockerfile.runtime.tdfs
+++ b/docker/tdfs-rt.ubuntu-1604.Dockerfile
@@ -1,14 +1,12 @@
 FROM ubuntu:18.04
 
 ENV SGX_DOWNLOAD_URL_BASE "https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server"
-ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-bionic1_amd64.deb
+ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-xenial1_amd64.deb
 ENV LIBSGX_ENCLAVE_COMMON_URL    "$SGX_DOWNLOAD_URL_BASE/$LIBSGX_ENCLAVE_COMMON"
 
 RUN apt-get update && apt-get install -q -y \
-    lsof \
-    wget \
-    libcurl4-openssl-dev \
-    libprotobuf-dev
+    libcurl3 \
+    libprotobuf9v5
 
 RUN wget -O $LIBSGX_ENCLAVE_COMMON "$LIBSGX_ENCLAVE_COMMON_URL" && \
     mkdir /etc/init                                             && \
diff --git a/docker/Dockerfile.runtime.tdfs b/docker/tdfs-rt.ubuntu-1804.Dockerfile
similarity index 97%
rename from docker/Dockerfile.runtime.tdfs
rename to docker/tdfs-rt.ubuntu-1804.Dockerfile
index f5eda67..9879192 100644
--- a/docker/Dockerfile.runtime.tdfs
+++ b/docker/tdfs-rt.ubuntu-1804.Dockerfile
@@ -5,8 +5,6 @@ ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-bionic1_amd
 ENV LIBSGX_ENCLAVE_COMMON_URL    "$SGX_DOWNLOAD_URL_BASE/$LIBSGX_ENCLAVE_COMMON"
 
 RUN apt-get update && apt-get install -q -y \
-    lsof \
-    wget \
     libcurl4-openssl-dev \
     libprotobuf-dev
 
diff --git a/docker/Dockerfile.runtime.tms b/docker/tms-rt.ubuntu-1604.Dockerfile
similarity index 89%
copy from docker/Dockerfile.runtime.tms
copy to docker/tms-rt.ubuntu-1604.Dockerfile
index 111757e..792907b 100644
--- a/docker/Dockerfile.runtime.tms
+++ b/docker/tms-rt.ubuntu-1604.Dockerfile
@@ -1,14 +1,12 @@
 FROM ubuntu:18.04
 
 ENV SGX_DOWNLOAD_URL_BASE "https://download.01.org/intel-sgx/linux-2.6/ubuntu18.04-server"
-ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-bionic1_amd64.deb
+ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-xenial1_amd64.deb
 ENV LIBSGX_ENCLAVE_COMMON_URL    "$SGX_DOWNLOAD_URL_BASE/$LIBSGX_ENCLAVE_COMMON"
 
 RUN apt-get update && apt-get install -q -y \
-    lsof \
-    wget \
-    libcurl4-openssl-dev \
-    libprotobuf-dev
+    libcurl3 \
+    libprotobuf9v5
 
 RUN wget -O $LIBSGX_ENCLAVE_COMMON "$LIBSGX_ENCLAVE_COMMON_URL" && \
     mkdir /etc/init                                             && \
diff --git a/docker/Dockerfile.runtime.tms b/docker/tms-rt.ubuntu-1804.Dockerfile
similarity index 97%
rename from docker/Dockerfile.runtime.tms
rename to docker/tms-rt.ubuntu-1804.Dockerfile
index 111757e..5b08f11 100644
--- a/docker/Dockerfile.runtime.tms
+++ b/docker/tms-rt.ubuntu-1804.Dockerfile
@@ -5,8 +5,6 @@ ENV LIBSGX_ENCLAVE_COMMON        libsgx-enclave-common_2.6.100.51363-bionic1_amd
 ENV LIBSGX_ENCLAVE_COMMON_URL    "$SGX_DOWNLOAD_URL_BASE/$LIBSGX_ENCLAVE_COMMON"
 
 RUN apt-get update && apt-get install -q -y \
-    lsof \
-    wget \
     libcurl4-openssl-dev \
     libprotobuf-dev
 
diff --git a/mesatee_utils/protected_fs_rs/protected_fs_c/build.sh b/mesatee_utils/protected_fs_rs/protected_fs_c/build.sh
index 0a64e7c..48165c8 100644
--- a/mesatee_utils/protected_fs_rs/protected_fs_c/build.sh
+++ b/mesatee_utils/protected_fs_rs/protected_fs_c/build.sh
@@ -40,6 +40,6 @@ SOURCE_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
 mkdir -p "${BUILD_DIR}"
 cd "${BUILD_DIR}"
 cmake "${MODE}" "${SOURCE_DIR}"
-cmake --build .
+make -j1
 
 # Final libraries will be installed to $BUILD_DIR/target


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


Mime
View raw message