@@ -98,9 +98,8 @@ pipeline {
sh '''
cd LibOS/shim/test/apps/apache
make SGX=1
- make SGX_RUN=1
- make SGX_RUN=1 start-graphene-server &
- sleep 15
+ make SGX=1 start-graphene-server &
+ sleep 30
LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
'''
}
@@ -99,9 +99,8 @@ pipeline {
*/
@@ -6,27 +6,31 @@ RUN apt-get update \
&& apt-get install -y \
apache2-utils \
autoconf \
+ bison \
build-essential \
+ curl \
+ flex \
gawk \
- bison \
gettext \
git \
+ libapr1-dev \
+ libaprutil1-dev \
libexpat1 \
libexpat1-dev \
+ libomp-dev \
+ libpcre2-dev \
libpcre3-dev \
+ libprotobuf-c-dev \
libxml2-dev \
linux-headers-4.4.0-161-generic \
net-tools \
+ protobuf-c-compiler \
python \
- python3-pip \
python3-minimal \
+ python3-pip \
python3-pytest \
texinfo \
wget \
- curl \
- libomp-dev \
- libprotobuf-c-dev \
- protobuf-c-compiler \
&& /usr/bin/pip3 install protobuf \
# Add the user UID:1001, GID:1001, home at /leeroy
@@ -5,29 +5,33 @@ FROM ubuntu:18.04
RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install -y \
libelf-dev \
libomp-dev \
linux-headers-4.15.0-20-generic \
+ python3-breathe \
python3-pip \
python3-protobuf \
- python3-breathe \
- wget \
- protobuf-c-compiler
+ wget
RUN pip3 install 'Sphinx>=1.8' sphinx_rtd_theme recommonmark
@@ -1 +1 @@
-Subproject commit dc4464ce0f6d48d966df7a20f33289c2a655325b
+Subproject commit c8062b70fb795b8257e6153d15d7fa1781297c5a