Skip to content
Permalink
Browse files

dockerfile: upgrade to ubuntu 18

Signed-off-by: Vitaly Chipounov <vitaly@cyberhaven.io>
  • Loading branch information
vitalych committed Feb 5, 2019
1 parent 6531bc1 commit 9802fee21cc8da3321da72cce237551e280498a7
Showing with 15 additions and 9 deletions.
  1. +9 −3 Dockerfile
  2. +6 −6 Dockerfile.dist
@@ -1,11 +1,11 @@
# Copyright (C) 2017, Cyberhaven
# Copyright (C) 2017-2019, Cyberhaven
# All rights reserved.
#
# Licensed under the Cyberhaven Research License Agreement.

# Installs S2E and its associated libraries and tools to /opt/s2e

FROM ubuntu:16.04
FROM ubuntu:18.04

# Use local mirrors if possible
RUN sed -i '1ideb mirror://mirrors.ubuntu.com/mirrors.txt xenial main restricted' /etc/apt/sources.list && \
@@ -23,7 +23,7 @@ RUN apt-get update && apt-get -y install libdwarf-dev libelf-dev libelf-dev:i386
libmemcached-dev libpq-dev libc6-dev-i386 binutils-dev \
libboost-system-dev libboost-serialization-dev libboost-regex-dev \
libbsd-dev libpixman-1-dev \
libglib2.0-dev python-docutils libpng12-dev gcc-multilib g++-multilib
libglib2.0-dev libglib2.0-dev:i386 python-docutils libpng12-dev gcc-multilib g++-multilib

# Install S2E git
RUN apt-get -y install git
@@ -49,6 +49,12 @@ RUN cd s2e-build && \
RUN cd s2e-build && \
make -f ../s2e/Makefile S2E_PREFIX=/opt/s2e stamps/protobuf-make

RUN cd s2e-build && \
make -f ../s2e/Makefile S2E_PREFIX=/opt/s2e stamps/libdwarf-make

RUN cd s2e-build && \
make -f ../s2e/Makefile S2E_PREFIX=/opt/s2e stamps/rapidjson-make

# Make the S2E codebase available in the container
COPY . s2e/

@@ -1,9 +1,9 @@
# Copyright (C) 2017, Cyberhaven
# Copyright (C) 2017-2019, Cyberhaven
# All rights reserved.
#
# Licensed under the Cyberhaven Research License Agreement.

FROM ubuntu:16.04
FROM ubuntu:18.04
MAINTAINER Vitaly Chipounov <vitaly@cyberhaven.io>

RUN sed -i '1ideb mirror://mirrors.ubuntu.com/mirrors.txt xenial main restricted' /etc/apt/sources.list && \
@@ -20,11 +20,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
wget libsvn1 libcurl3 gdb python2.7-dbg libssl-dev \
libstdc++6:i386 libpython2.7:i386 lib32ncurses5 lib32ncurses5-dev \
libncurses5-dev libx32ncurses5-dev libncurses5-dev:i386 \
libxml2-dev libxslt1-dev libffi-dev \
lsof psmisc libboost-serialization1.58.0 libboost-regex1.58 \
libxml2-dev libicu-dev libxslt1-dev libffi-dev \
lsof psmisc libboost-system1.65.1 libboost-serialization1.65.1 libboost-regex1.65.1 \
libmemcached11 libgettextpo0 libelf1 libelf1:i386 libjemalloc1 \
libpcre3 libpcre3-dev libxml2-dev:i386 libpcre3:i386 \
liblua5.1-0 liblua5.2-0 libsigc++-2.0-dev jq \
libpcre3 libpcre3-dev libpcre3:i386 \
liblua5.1-0 liblua5.2-0 libsigc++-2.0-dev jq libpng12-0 \
python-yaml python-matplotlib python-lxml python-pip sudo && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
libc6-dev-i386 lib32stdc++-4.8-dev time \

0 comments on commit 9802fee

Please sign in to comment.
You can’t perform that action at this time.