teaclave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ms...@apache.org
Subject [incubator-teaclave] 02/03: [docker] Update docker file for building teaclave
Date Thu, 09 Apr 2020 06:29:19 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 1f2b4c6e0388b7ff7725f09a65db54776ec479bc
Author: Mingshen Sun <bob@mssun.me>
AuthorDate: Wed Apr 8 21:28:09 2020 -0700

    [docker] Update docker file for building teaclave
---
 .drone.yml                                       | 60 ++++++++++++------------
 docker/build.ubuntu-1804.sgx-2.9.Dockerfile      |  5 +-
 docker/build.ubuntu-1804.sgx-dcap-1.5.Dockerfile |  5 +-
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index cbd44ed..57728f8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,23 +3,23 @@ name: sgx-debug-ubuntu-1804
 
 steps:
 - name: prepare
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DTEST_MODE=ON ..
 - name: check
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: compile
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && make VERBOSE=1 -j2
 - name: test
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   environment:
     AS_ALGO: sgx_epid
     AS_URL: https://api.trustedservices.intel.com:443
@@ -55,25 +55,25 @@ name: sgx-dcap-debug-ubuntu-1804
 
 steps:
 - name: prepare
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-dcap-1.5:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-dcap-1.5:0.1.0
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DTEST_MODE=ON -DDCAP=ON ..
 - name: check
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-dcap-1.5:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-dcap-1.5:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: compile
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-dcap-1.5:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-dcap-1.5:0.1.0
   commands:
   - . /root/.cargo/env
   - . /opt/sgxsdk/environment
   - sed -i 's/ias_root_ca_cert/dcap_root_ca_cert/' config/build.config.toml
   - cd build && make VERBOSE=1 -j2
 - name: test
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-dcap-1.5:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-dcap-1.5:0.1.0
   environment:
     AS_ALGO: sgx_ecdsa
     AS_URL: https://localhost:8080
@@ -121,23 +121,23 @@ name: sgx-release-ubuntu-1804
 
 steps:
 - name: prepare
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake -DTEST_MODE=ON ..
 - name: check
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: compile
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && make VERBOSE=1 -j2
 - name: test
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   privileged: true
   environment:
     AS_ALGO: sgx_epid
@@ -173,23 +173,23 @@ name: sim-debug-ubuntu-1804
 
 steps:
 - name: prepare
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake -DTEST_MODE=ON ..
 - name: check
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: compile
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DSGX_SIM_MODE=ON .. && make
VERBOSE=1 -j2
 - name: test
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && make run-tests
@@ -204,23 +204,23 @@ name: sim-release-ubuntu-1804
 
 steps:
 - name: prepare
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake -DTEST_MODE=YES ..
 - name: check
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: compile
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && cmake -DSGX_SIM_MODE=ON .. && make VERBOSE=1 -j2
 - name: test
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && make run-tests
@@ -401,18 +401,18 @@ name: lint
 
 steps:
 - name: prepare
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - mkdir -p build
   - cd build && cmake -DRUSTFLAGS="-D warnings" -DTEST_MODE=ON ..
 - name: check
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && make check
 - name: clippy
-  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+  image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
   commands:
   - . /root/.cargo/env
   - cd build && make CLP=1
@@ -427,24 +427,24 @@ node:
 
 # steps:
 # - name: prepare
-#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
 #   commands:
 #   - . /root/.cargo/env
 #   - mkdir -p build
 #   - cd build && cmake -DCMAKE_BUILD_TYPE=DEBUG -DCOV=ON -DTEST_MODE=ON ..
 # - name: check
-#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
 #   commands:
 #   - . /root/.cargo/env
 #   - cd build && make check
 # - name: compile
-#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
 #   commands:
 #   - . /root/.cargo/env
 #   - export RUSTFLAGS="-D warnings"
 #   - cd build && make VERBOSE=1 -j2
 # - name: test
-#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
 #   environment:
 #     AS_ALGO: sgx_epid
 #     AS_URL: https://api.trustedservices.intel.com:443
@@ -463,7 +463,7 @@ node:
 #   - cd build && make run-tests
 # - name: coverage
 #   failure: ignore
-#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
 #   commands:
 #   - cd build && make cov
 #   - bash -c "bash <(curl -s https://codecov.io/bash) -f intermediate/cov.info"
@@ -495,13 +495,13 @@ node:
 
 # steps:
 # - name: prepare
-#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
 #   commands:
 #   - . /root/.cargo/env
 #   - mkdir -p build
 #   - cd build && cmake ..
 # - name: doc
-#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:latest
+#   image: teaclave/teaclave-build-ubuntu-1804-sgx-2.9:0.1.0
 #   failure: ignore
 #   commands:
 #   - . /root/.cargo/env
diff --git a/docker/build.ubuntu-1804.sgx-2.9.Dockerfile b/docker/build.ubuntu-1804.sgx-2.9.Dockerfile
index c07d215..afd4d06 100644
--- a/docker/build.ubuntu-1804.sgx-2.9.Dockerfile
+++ b/docker/build.ubuntu-1804.sgx-2.9.Dockerfile
@@ -72,7 +72,10 @@ RUN apt-get update && apt-get install -q -y \
     procps \
     lcov \
     llvm \
-    curl
+    curl \
+    python3-pip
+
+RUN pip3 install pyopenssl toml cryptography
 
 # clean up apt caches
 
diff --git a/docker/build.ubuntu-1804.sgx-dcap-1.5.Dockerfile b/docker/build.ubuntu-1804.sgx-dcap-1.5.Dockerfile
index 19d7cd8..bc719f9 100644
--- a/docker/build.ubuntu-1804.sgx-dcap-1.5.Dockerfile
+++ b/docker/build.ubuntu-1804.sgx-dcap-1.5.Dockerfile
@@ -74,7 +74,10 @@ RUN apt-get update && apt-get install -q -y \
     lcov \
     llvm \
     curl \
-    iproute2
+    iproute2 \
+    python3-pip
+
+RUN pip3 install pyopenssl toml cryptography
 
 # clean up apt caches
 


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


Mime
View raw message