From 8237f32bd5b68d3cb46727b278621f8129f243b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sat, 17 Mar 2018 14:15:39 -0400
Subject: [PATCH] travis: update Dockerfiles, change base OS to Ubuntu 16.04
---
.travis.yml | 3 ---
docker/DockerfileDeps | 19 +++++++++++++++++--
docker/DockerfileDepsLlvm | 20 ++++++++++++++++++--
docker/DockerfileDepsProxy | 16 ----------------
docker/DockerfileTravis | 2 --
docker/DockerfileTravisLlvm | 2 --
docker/DockerfileTravisProxy | 4 +---
7 files changed, 36 insertions(+), 30 deletions(-)
delete mode 100644 docker/DockerfileDepsProxy
diff --git a/.travis.yml b/.travis.yml
index de9c3720..3621f2be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,9 +20,6 @@ before_install:
# non llvm builds
if [[ "$OPENDHT_TEST_JOB" != *"opendht.llvm"* ]]; then
docker pull aberaud/opendht-deps;
- if [[ "$OPENDHT_TEST_JOB" != *"opendht.classic"* ]]; then
- docker build -t opendht-deps-proxy -f docker/DockerfileDepsProxy .;
- fi
fi
- |
diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps
index 9b7dc466..0af9f196 100644
--- a/docker/DockerfileDeps
+++ b/docker/DockerfileDeps
@@ -1,3 +1,18 @@
-FROM ubuntu:17.04
+FROM ubuntu:16.04
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
-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
+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
+
+# build restbed from sources
+RUN git clone --recursive https://github.com/corvusoft/restbed.git \
+ && cd restbed && mkdir build && cd build \
+ && cmake -DBUILD_TESTS=NO -DBUILD_EXAMPLES=NO -DBUILD_SSL=NO -DBUILD_SHARED=YES -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .. \
+ && make -j8 install \
+ && cd .. && rm -rf restbed
+
+#build msgpack from source
+RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-2.1.5/msgpack-2.1.5.tar.gz \
+ && tar -xzf msgpack-2.1.5.tar.gz \
+ && cd msgpack-2.1.5 && mkdir build && cd build \
+ && cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \
+ && make -j8 && make install \
+ && cd ../.. && rm -rf msgpack-2.1.5 msgpack-2.1.5.tar.gz
diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm
index 5dc9fb56..e407f552 100644
--- a/docker/DockerfileDepsLlvm
+++ b/docker/DockerfileDepsLlvm
@@ -1,7 +1,23 @@
-FROM ubuntu:17.04
+FROM ubuntu:16.04
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
RUN apt-get update \
- && 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 \
+ && 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 \
&& apt-get remove -y gcc g++ && apt-get autoremove -y && apt-get clean
+
ENV CC cc
ENV CXX c++
+
+# build restbed from sources
+RUN git clone --recursive https://github.com/corvusoft/restbed.git \
+ && cd restbed && mkdir build && cd build \
+ && cmake -DBUILD_TESTS=NO -DBUILD_EXAMPLES=NO -DBUILD_SSL=NO -DBUILD_SHARED=YES -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .. \
+ && make -j8 install \
+ && cd .. && rm -rf restbed
+
+#build msgpack from source
+RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-2.1.5/msgpack-2.1.5.tar.gz \
+ && tar -xzf msgpack-2.1.5.tar.gz \
+ && cd msgpack-2.1.5 && mkdir build && cd build \
+ && cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \
+ && make -j8 && make install \
+ && cd ../.. && rm -rf msgpack-2.1.5 msgpack-2.1.5.tar.gz
diff --git a/docker/DockerfileDepsProxy b/docker/DockerfileDepsProxy
deleted file mode 100644
index 346b7d89..00000000
--- a/docker/DockerfileDepsProxy
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM aberaud/opendht-deps
-
-# install jsoncpp
-RUN apt-get install libjsoncpp-dev -y
-
-# install restbed dependencies
-RUN sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list # LTS... avoid 404 for libasio-dev
-RUN apt-get update -y
-RUN apt-get install libasio-dev -y
-
-# build restbed from sources
-RUN git clone --recursive https://github.com/corvusoft/restbed.git
-WORKDIR restbed/build
-RUN cmake -DBUILD_TESTS=NO -DBUILD_EXAMPLES=NO -DBUILD_SSL=NO -DBUILD_SHARED=YES -DCMAKE_INSTALL_PREFIX=/usr ..
-RUN make -j 8 install
-RUN mv /usr/library/librestbed* /usr/lib/
diff --git a/docker/DockerfileTravis b/docker/DockerfileTravis
index 840e4ccd..1b8408b2 100644
--- a/docker/DockerfileTravis
+++ b/docker/DockerfileTravis
@@ -1,8 +1,6 @@
FROM aberaud/opendht-deps
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
-RUN apt-get install -y libcppunit-dev # temp while aberaud/opendht-deps doesn't have this
-
COPY . /root/opendht
RUN cd /root/opendht && mkdir build && cd build \
&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_LTO=On -DOPENDHT_TESTS=ON .. \
diff --git a/docker/DockerfileTravisLlvm b/docker/DockerfileTravisLlvm
index b4a443e6..4811df38 100644
--- a/docker/DockerfileTravisLlvm
+++ b/docker/DockerfileTravisLlvm
@@ -1,8 +1,6 @@
FROM aberaud/opendht-deps-llvm
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
-RUN apt-get install -y libcppunit-dev # temp while aberaud/opendht-deps doesn't have this
-
COPY . /root/opendht
RUN cd /root/opendht && mkdir build && cd build \
&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_TESTS=ON .. \
diff --git a/docker/DockerfileTravisProxy b/docker/DockerfileTravisProxy
index 551217b7..a4a88358 100644
--- a/docker/DockerfileTravisProxy
+++ b/docker/DockerfileTravisProxy
@@ -1,6 +1,4 @@
-FROM opendht-deps-proxy
+FROM aberaud/opendht-deps
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
-RUN apt-get install -y libcppunit-dev # temp while aberaud/opendht-deps doesn't have this
-
COPY . /root/opendht
--
GitLab