diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps index f03d6995f229b554347966dbe93387e357ee4e7c..b7146c4538ba614983769021c361d75bafa0b896 100644 --- a/docker/DockerfileDeps +++ b/docker/DockerfileDeps @@ -22,8 +22,8 @@ RUN echo "*** Building nodejs/http_parser dependency ***" \ # libasio-dev (1.10.6-3) is too old RUN echo "** Building a recent version of asio ***" \ - && wget https://github.com/aberaud/asio/archive/b2b7a1c166390459e1c169c8ae9ef3234b361e3f.tar.gz \ - && tar -xvf b2b7a1c166390459e1c169c8ae9ef3234b361e3f.tar.gz && cd asio-b2b7a1c166390459e1c169c8ae9ef3234b361e3f/asio \ + && wget https://github.com/aberaud/asio/archive/a7d66ef4017d8f1b7f2cef1bb4ba8e23b0961571.tar.gz \ + && tar -xvf a7d66ef4017d8f1b7f2cef1bb4ba8e23b0961571.tar.gz && cd asio-a7d66ef4017d8f1b7f2cef1bb4ba8e23b0961571/asio \ && ./autogen.sh && ./configure --prefix=/usr --without-boost --disable-examples --disable-tests \ && make install \ && cd ../../ && rm -rf asio* diff --git a/docker/DockerfileDepsBionic b/docker/DockerfileDepsBionic index a00ae9b83fe9f7ab6f13d7a220431509eda7a5ae..37c8b91a69592f45a73dcbf37fc309c04e970994 100644 --- a/docker/DockerfileDepsBionic +++ b/docker/DockerfileDepsBionic @@ -5,13 +5,13 @@ 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 cmake 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 \ + autotools-dev autoconf libfmt-dev libhttp-parser-dev libmsgpack-dev libssl-dev \ && apt-get clean # libasio-dev (1.10) is too old RUN echo "** Building a recent version of asio ***" \ - && wget https://github.com/aberaud/asio/archive/b2b7a1c166390459e1c169c8ae9ef3234b361e3f.tar.gz \ - && tar -xvf b2b7a1c166390459e1c169c8ae9ef3234b361e3f.tar.gz && cd asio-b2b7a1c166390459e1c169c8ae9ef3234b361e3f/asio \ + && wget https://github.com/aberaud/asio/archive/a7d66ef4017d8f1b7f2cef1bb4ba8e23b0961571.tar.gz \ + && tar -xvf a7d66ef4017d8f1b7f2cef1bb4ba8e23b0961571.tar.gz && cd asio-a7d66ef4017d8f1b7f2cef1bb4ba8e23b0961571/asio \ && ./autogen.sh && ./configure --prefix=/usr --without-boost --disable-examples --disable-tests \ && make install \ && cd ../../ && rm -rf asio* diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm index 797b9ec9ce68187656de4f32566de6925d5b3322..f909e07a52b4ad95ed4b0e10466f7c28b73523f2 100644 --- a/docker/DockerfileDepsLlvm +++ b/docker/DockerfileDepsLlvm @@ -26,8 +26,8 @@ RUN echo "*** Building nodejs/http_parser dependency ***" \ # libasio-dev (1.10.6-3) is too old RUN echo "** Building a recent version of asio ***" \ - && wget https://github.com/aberaud/asio/archive/b2b7a1c166390459e1c169c8ae9ef3234b361e3f.tar.gz \ - && tar -xvf b2b7a1c166390459e1c169c8ae9ef3234b361e3f.tar.gz && cd asio-b2b7a1c166390459e1c169c8ae9ef3234b361e3f/asio \ + && wget https://github.com/aberaud/asio/archive/a7d66ef4017d8f1b7f2cef1bb4ba8e23b0961571.tar.gz \ + && tar -xvf a7d66ef4017d8f1b7f2cef1bb4ba8e23b0961571.tar.gz && cd asio-a7d66ef4017d8f1b7f2cef1bb4ba8e23b0961571/asio \ && ./autogen.sh && ./configure --prefix=/usr --without-boost --disable-examples --disable-tests \ && make install \ && cd ../../ && rm -rf asio* diff --git a/docker/DockerfileTravis b/docker/DockerfileTravis index 1b8408b2f1228be9cf5fcd10dc8b0369bc973522..f914f4211c0b591fc3c151be0ddcb43679f36927 100644 --- a/docker/DockerfileTravis +++ b/docker/DockerfileTravis @@ -3,5 +3,5 @@ MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com> 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 .. \ + && cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_C=On -DOPENDHT_LTO=On -DOPENDHT_TESTS=ON .. \ && make -j8 && ./opendht_unit_tests && make install diff --git a/docker/DockerfileTravisLlvm b/docker/DockerfileTravisLlvm index 4811df389a9133aa00d204ca8f7814cc79afef3e..679e8828cc0e7d9b5ed1e6b203e7bae7a90977f3 100644 --- a/docker/DockerfileTravisLlvm +++ b/docker/DockerfileTravisLlvm @@ -3,5 +3,5 @@ MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com> COPY . /root/opendht RUN cd /root/opendht && mkdir build && cd build \ - && cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_TESTS=ON .. \ + && cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_C=On -DOPENDHT_TESTS=ON .. \ && make -j8 && ./opendht_unit_tests && make install