diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2b4a744f2dee651f143a85f2bfd337802ea4a12a..bf2ee566f64adf0df825f279568e58a61e13e35c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,13 @@
FROM aberaud/opendht-deps
-MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
+
RUN git clone https://github.com/savoirfairelinux/opendht.git \
&& cd opendht && mkdir build && cd build \
- && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_LTO=On -DOPENDHT_PROXY_SERVER=On -DOPENDHT_PROXY_CLIENT=On && make -j8 && make install \
+ && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
+ -DOPENDHT_C=On \
+ -DOPENDHT_PYTHON=On \
+ -DOPENDHT_PROXY_SERVER=On \
+ -DOPENDHT_PROXY_CLIENT=On \
+ && make -j8 && make install \
&& cd ../.. && rm -rf opendht
diff --git a/docker/DockerfileBionic b/docker/DockerfileBionic
index 4e2c27245fbb22e56a7585ed3c8f7c3aeaba331d..53c72e35b2b7ad4281329e41e01bc37e732bcb60 100644
--- a/docker/DockerfileBionic
+++ b/docker/DockerfileBionic
@@ -1,13 +1,13 @@
-FROM docker.pkg.github.com/savoirfairelinux/opendht/opendht-deps-bionic:2.1.3
-MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+FROM docker.pkg.github.com/savoirfairelinux/opendht/opendht-deps-bionic:latest
+LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
RUN git clone https://github.com/savoirfairelinux/opendht.git \
&& cd opendht && mkdir build && cd build \
&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
- -DOPENDHT_PROXY_CLIENT=On \
- -DOPENDHT_PROXY_SERVER=On \
- -DOPENDHT_C=On \
- -DOPENDHT_PYTHON=On \
- -DOPENDHT_LTO=On \
- && make -j8 && make install \
+ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
+ -DOPENDHT_C=On \
+ -DOPENDHT_PYTHON=On \
+ -DOPENDHT_PROXY_SERVER=On \
+ -DOPENDHT_PROXY_CLIENT=On \
+ && make -j8 && make install \
&& cd ../.. && rm -rf opendht
diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps
index 155d8218461f322fc1cef82404b6614b24bb15bf..15f81e818ca585945476f5272c5e81849b22fcc3 100644
--- a/docker/DockerfileDeps
+++ b/docker/DockerfileDeps
@@ -1,5 +1,5 @@
FROM ubuntu:20.04
-MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
RUN apt-get update && apt-get install -y \
dialog apt-utils \
@@ -13,13 +13,13 @@ RUN apt-get update && apt-get install -y \
libncurses5-dev libreadline-dev nettle-dev libcppunit-dev \
libgnutls28-dev libuv1-dev libjsoncpp-dev libargon2-dev \
libssl-dev libfmt-dev libhttp-parser-dev libasio-dev libmsgpack-dev \
- && apt-get clean
+ && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
RUN echo "*** Downloading RESTinio ***" \
&& mkdir restinio && cd restinio \
- && wget https://github.com/aberaud/restinio/archive/2224ffedef52cb2b74645d63d871d61dbd0f165e.tar.gz \
- && ls -l && tar -xzf 2224ffedef52cb2b74645d63d871d61dbd0f165e.tar.gz \
- && cd restinio-2224ffedef52cb2b74645d63d871d61dbd0f165e/dev \
+ && wget https://github.com/aberaud/restinio/archive/e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+ && ls -l && tar -xzf e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+ && cd restinio-e0a261dd8488246a3cb8bbb3ea781ea5139c3c94/dev \
&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
-DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
-DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
diff --git a/docker/DockerfileDepsBionic b/docker/DockerfileDepsBionic
index ad854587b2112b83e7f8a13d711e13f751bae741..ed1808f7d073f77abef86d560076d4971cd0bee3 100644
--- a/docker/DockerfileDepsBionic
+++ b/docker/DockerfileDepsBionic
@@ -1,14 +1,14 @@
FROM ubuntu:18.04
-MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
RUN echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries
RUN apt-get update && apt-get install -y \
apt-transport-https build-essential pkg-config git wget libncurses5-dev libreadline-dev nettle-dev \
libgnutls28-dev libuv1-dev cython3 python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev \
- autotools-dev autoconf libfmt-dev libhttp-parser-dev libmsgpack-dev libssl-dev \
- && apt-get clean
+ autotools-dev autoconf libfmt-dev libhttp-parser-dev libmsgpack-dev libssl-dev python3-pip \
+ && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-RUN apt-get update && apt-get install -y python3-pip && pip3 install --upgrade cmake
+RUN pip3 install --upgrade cmake
# libasio-dev (1.10) is too old
RUN echo "** Building a recent version of asio ***" \
@@ -20,9 +20,9 @@ RUN echo "** Building a recent version of asio ***" \
RUN echo "*** Downloading RESTinio ***" \
&& mkdir restinio && cd restinio \
- && wget https://github.com/aberaud/restinio/archive/8d5d3e8237e0947adb9ba1ffc8281f4ad7cb2a59.tar.gz \
- && ls -l && tar -xzf 8d5d3e8237e0947adb9ba1ffc8281f4ad7cb2a59.tar.gz \
- && cd restinio-8d5d3e8237e0947adb9ba1ffc8281f4ad7cb2a59/dev \
+ && wget https://github.com/aberaud/restinio/archive/e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+ && ls -l && tar -xzf e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+ && cd restinio-e0a261dd8488246a3cb8bbb3ea781ea5139c3c94/dev \
&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
-DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
-DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm
index 221aaea8e328436736450197ab0b314221db0142..24e28f908f758bb9e52553230599a0e0610881a1 100644
--- a/docker/DockerfileDepsLlvm
+++ b/docker/DockerfileDepsLlvm
@@ -1,5 +1,6 @@
FROM ubuntu:20.04
-MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
+
RUN apt-get update && apt-get install -y \
dialog apt-utils \
&& apt-get clean \
@@ -11,16 +12,17 @@ RUN apt-get update \
python3-setuptools libcppunit-dev python3-pip \
autotools-dev autoconf libssl-dev libargon2-dev \
libfmt-dev libhttp-parser-dev libasio-dev \
- && apt-get remove -y gcc g++ && apt-get autoremove -y && apt-get clean
+ && apt-get remove -y gcc g++ && apt-get autoremove -y \
+ && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
ENV CC cc
ENV CXX c++
RUN echo "*** Downloading RESTinio ***" \
&& mkdir restinio && cd restinio \
- && wget https://github.com/aberaud/restinio/archive/2224ffedef52cb2b74645d63d871d61dbd0f165e.tar.gz \
- && ls -l && tar -xzf 2224ffedef52cb2b74645d63d871d61dbd0f165e.tar.gz \
- && cd restinio-2224ffedef52cb2b74645d63d871d61dbd0f165e/dev \
+ && wget https://github.com/aberaud/restinio/archive/e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+ && ls -l && tar -xzf e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+ && cd restinio-e0a261dd8488246a3cb8bbb3ea781ea5139c3c94/dev \
&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
-DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
-DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
diff --git a/docker/DockerfileLlvm b/docker/DockerfileLlvm
index 62a08cd4f1d42b47e67aafa7cc76fd0c447452f7..7dd33f34c06ddcaa4ff9446e7e509dd39ab5b460 100644
--- a/docker/DockerfileLlvm
+++ b/docker/DockerfileLlvm
@@ -1,6 +1,13 @@
FROM aberaud/opendht-deps-llvm
-MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
+
RUN git clone https://github.com/savoirfairelinux/opendht.git \
&& cd opendht && mkdir build && cd build \
- && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_LTO=On -DOPENDHT_PROXY_SERVER=On -DOPENDHT_PROXY_CLIENT=On && make -j8 && make install \
+ && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
+ -DOPENDHT_C=On \
+ -DOPENDHT_PYTHON=On \
+ -DOPENDHT_PROXY_SERVER=On \
+ -DOPENDHT_PROXY_CLIENT=On \
+ && make -j8 && make install \
&& cd ../.. && rm -rf opendht
diff --git a/docker/DockerfileTravis b/docker/DockerfileTravis
index 625efb7ea2bcb17e857da65a935a805a84d7646d..669cd37345f674018ee8a39b3670427836a82392 100644
--- a/docker/DockerfileTravis
+++ b/docker/DockerfileTravis
@@ -1,5 +1,5 @@
FROM aberaud/opendht-deps-bionic
-MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
RUN apt-get update && apt-get install -y python3-pip && pip3 install --upgrade cmake
diff --git a/docker/DockerfileTravisLlvm b/docker/DockerfileTravisLlvm
index 679e8828cc0e7d9b5ed1e6b203e7bae7a90977f3..50fee7657b71fd9ce4b1416ffb427501c969b330 100644
--- a/docker/DockerfileTravisLlvm
+++ b/docker/DockerfileTravisLlvm
@@ -1,5 +1,5 @@
FROM aberaud/opendht-deps-llvm
-MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
COPY . /root/opendht
RUN cd /root/opendht && mkdir build && cd build \
diff --git a/docker/DockerfileTravisProxy b/docker/DockerfileTravisProxy
index a4a88358964610ec8ff4925755cbaef45da1d98e..652ede65cdeedb00d0781e27abfc849be6a4602c 100644
--- a/docker/DockerfileTravisProxy
+++ b/docker/DockerfileTravisProxy
@@ -1,4 +1,4 @@
FROM aberaud/opendht-deps
-MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
COPY . /root/opendht