Skip to content

Commit 8237f32

Browse files
aberaudaberaud
committed
travis: update Dockerfiles, change base OS to Ubuntu 16.04
1 parent 546e63e commit 8237f32

File tree

7 files changed

+36
-30
lines changed

7 files changed

+36
-30
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ before_install:
2020
# non llvm builds
2121
if [[ "$OPENDHT_TEST_JOB" != *"opendht.llvm"* ]]; then
2222
docker pull aberaud/opendht-deps;
23-
if [[ "$OPENDHT_TEST_JOB" != *"opendht.classic"* ]]; then
24-
docker build -t opendht-deps-proxy -f docker/DockerfileDepsProxy .;
25-
fi
2623
fi
2724
2825
- |

‎docker/DockerfileDeps‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1-
FROM ubuntu:17.04
1+
FROM ubuntu:16.04
22
MAINTAINER Adrien Béraud <[email protected]>
3-
RUN apt-get update && apt-get install -y build-essential cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libargon2-0-dev cython3 python3-dev libcppunit-dev python3-setuptools && apt-get clean
3+
RUN apt-get update && apt-get install -y build-essential cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls28-dev libuv1-dev cython3 python3-dev libcppunit-dev libjsoncpp-dev libasio-dev libssl-dev python3-setuptools && apt-get clean
4+
5+
# build restbed from sources
6+
RUN git clone --recursive https://github.com/corvusoft/restbed.git \
7+
&& cd restbed && mkdir build && cd build \
8+
&& cmake -DBUILD_TESTS=NO -DBUILD_EXAMPLES=NO -DBUILD_SSL=NO -DBUILD_SHARED=YES -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .. \
9+
&& make -j8 install \
10+
&& cd .. && rm -rf restbed
11+
12+
#build msgpack from source
13+
RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-2.1.5/msgpack-2.1.5.tar.gz \
14+
&& tar -xzf msgpack-2.1.5.tar.gz \
15+
&& cd msgpack-2.1.5 && mkdir build && cd build \
16+
&& cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \
17+
&& make -j8 && make install \
18+
&& cd ../.. && rm -rf msgpack-2.1.5 msgpack-2.1.5.tar.gz

‎docker/DockerfileDepsLlvm‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1-
FROM ubuntu:17.04
1+
FROM ubuntu:16.04
22
MAINTAINER Adrien Béraud <[email protected]>
33
RUN apt-get update \
4-
&& apt-get install -y llvm llvm-dev clang make cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libargon2-0-dev cython3 python3-dev python3-setuptools libcppunit-dev \
4+
&& apt-get install -y llvm llvm-dev clang make cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libjsoncpp-dev libasio-dev cython3 python3-dev python3-setuptools libcppunit-dev \
55
&& apt-get remove -y gcc g++ && apt-get autoremove -y && apt-get clean
6+
67
ENV CC cc
78
ENV CXX c++
9+
10+
# build restbed from sources
11+
RUN git clone --recursive https://github.com/corvusoft/restbed.git \
12+
&& cd restbed && mkdir build && cd build \
13+
&& cmake -DBUILD_TESTS=NO -DBUILD_EXAMPLES=NO -DBUILD_SSL=NO -DBUILD_SHARED=YES -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .. \
14+
&& make -j8 install \
15+
&& cd .. && rm -rf restbed
16+
17+
#build msgpack from source
18+
RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-2.1.5/msgpack-2.1.5.tar.gz \
19+
&& tar -xzf msgpack-2.1.5.tar.gz \
20+
&& cd msgpack-2.1.5 && mkdir build && cd build \
21+
&& cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \
22+
&& make -j8 && make install \
23+
&& cd ../.. && rm -rf msgpack-2.1.5 msgpack-2.1.5.tar.gz

‎docker/DockerfileDepsProxy‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎docker/DockerfileTravis‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
FROM aberaud/opendht-deps
22
MAINTAINER Adrien Béraud <[email protected]>
33

4-
RUN apt-get install -y libcppunit-dev # temp while aberaud/opendht-deps doesn't have this
5-
64
COPY . /root/opendht
75
RUN cd /root/opendht && mkdir build && cd build \
86
&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_LTO=On -DOPENDHT_TESTS=ON .. \

‎docker/DockerfileTravisLlvm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
FROM aberaud/opendht-deps-llvm
22
MAINTAINER Adrien Béraud <[email protected]>
33

4-
RUN apt-get install -y libcppunit-dev # temp while aberaud/opendht-deps doesn't have this
5-
64
COPY . /root/opendht
75
RUN cd /root/opendht && mkdir build && cd build \
86
&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_TESTS=ON .. \

‎docker/DockerfileTravisProxy‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
FROM opendht-deps-proxy
1+
FROM aberaud/opendht-deps
22
MAINTAINER Adrien Béraud <[email protected]>
33

4-
RUN apt-get install -y libcppunit-dev # temp while aberaud/opendht-deps doesn't have this
5-
64
COPY . /root/opendht

0 commit comments

Comments
 (0)