You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesatee.apache.org by ms...@apache.org on 2019/11/21 05:20:33 UTC
[incubator-mesatee] branch master updated: Add pypy/pypy-dev as
build dependencies in Dockerfile (#70)
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
View the commit online:
https://github.com/apache/incubator-mesatee/commit/81d148045ec62732b097e7b3981608c15ce7e677
The following commit(s) were added to refs/heads/master by this push:
new 81d1480 Add pypy/pypy-dev as build dependencies in Dockerfile (#70)
81d1480 is described below
commit 81d148045ec62732b097e7b3981608c15ce7e677
Author: Mingshen Sun <bo...@mssun.me>
AuthorDate: Wed Nov 20 21:20:27 2019 -0800
Add pypy/pypy-dev as build dependencies in Dockerfile (#70)
---
.drone.yml | 34 +++++++++++++++++-----------------
Dockerfile | 7 ++++++-
2 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/.drone.yml b/.drone.yml
index c2da969..767ace9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,7 +3,7 @@ name: cmake-release
steps:
- name: prepare
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
commands:
- mkdir -p bin
- echo $V5_SPID > bin/ias_spid.txt
@@ -17,23 +17,23 @@ steps:
V5_SPID:
from_secret: V5_SPID
- name: check
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
commands:
- . /root/.cargo/env
- cd build && make check
- name: compile
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
commands:
- . /root/.cargo/env
- export RUSTFLAGS="-D warnings"
- cd build && make VERBOSE=1 -j2
- name: clippy
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
commands:
- . /root/.cargo/env
- cd build && make CLP=1
- name: sgx-test
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
privileged: true
volumes:
- name: isgx
@@ -62,7 +62,7 @@ name: cmake-debug
steps:
- name: prepare
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
commands:
- mkdir -p bin
- echo $V5_SPID > bin/ias_spid.txt
@@ -76,18 +76,18 @@ steps:
V5_SPID:
from_secret: V5_SPID
- name: check
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
commands:
- . /root/.cargo/env
- cd build && make check
- name: compile
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
commands:
- . /root/.cargo/env
- export RUSTFLAGS="-D warnings"
- cd build && make VERBOSE=1 -j2
- name: sgx-test
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
privileged: true
volumes:
- name: isgx
@@ -116,7 +116,7 @@ name: cmake-sim_release
steps:
- name: prepare
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
commands:
- . /root/.cargo/env
- mkdir -p build
@@ -125,17 +125,17 @@ steps:
V5_SPID:
from_secret: V5_SPID
- name: check
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
commands:
- . /root/.cargo/env
- cd build && make check
- name: compile
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
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.4
+ image: mesalocklinux/build-mesatee:0.1.5
privileged: true
commands:
- . /root/.cargo/env
@@ -151,7 +151,7 @@ name: cmake-sim_debug
steps:
- name: prepare
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
commands:
- . /root/.cargo/env
- mkdir -p build
@@ -160,17 +160,17 @@ steps:
V5_SPID:
from_secret: V5_SPID
- name: check
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
commands:
- . /root/.cargo/env
- cd build && make check
- name: compile
- image: mesalocklinux/build-mesatee:0.1.4
+ image: mesalocklinux/build-mesatee:0.1.5
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.4
+ image: mesalocklinux/build-mesatee:0.1.5
privileged: true
commands:
- . /root/.cargo/env
diff --git a/Dockerfile b/Dockerfile
index 04dfcdd..707d6e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,6 +49,11 @@ RUN apt-get update && apt-get install -q -y \
systemd-sysv \
gdb
+# install other dependencies
+RUN apt-get update && apt-get install -q -y \
+ pypy \
+ pypy-dev
+
RUN mkdir ~/sgx && \
mkdir /etc/init && \
cd ~/sgx && \
@@ -78,7 +83,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
# install dependencies for testing and coverage
-RUN apt-get install -q -y \
+RUN apt-get update && apt-get install -q -y \
lsof \
procps \
lcov \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@mesatee.apache.org
For additional commands, e-mail: commits-help@mesatee.apache.org