From f0aee6f9097d083bc873a114473a4811512f629a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 19 Jun 2020 15:44:35 -0400
Subject: [PATCH] docker: update restinio
---
docker/DockerfileBionic | 2 +-
docker/DockerfileDeps | 8 ++++----
docker/DockerfileDepsLlvm | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docker/DockerfileBionic b/docker/DockerfileBionic
index c39a96f9..4e2c2724 100644
--- a/docker/DockerfileBionic
+++ b/docker/DockerfileBionic
@@ -1,4 +1,4 @@
-FROM docker.pkg.github.com/savoirfairelinux/opendht/opendht-deps-bionic:2.0.0
+FROM docker.pkg.github.com/savoirfairelinux/opendht/opendht-deps-bionic:2.1.3
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
RUN git clone https://github.com/savoirfairelinux/opendht.git \
diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps
index f2cec402..57cb87b4 100644
--- a/docker/DockerfileDeps
+++ b/docker/DockerfileDeps
@@ -17,11 +17,11 @@ RUN apt-get update && apt-get install -y \
RUN echo "*** Downloading RESTinio ***" \
&& mkdir restinio && cd restinio \
- && wget https://github.com/aberaud/restinio/archive/a7a10e419d9089c5b8ee63f5e3098c892f22fae4.tar.gz \
- && ls -l && tar -xzf a7a10e419d9089c5b8ee63f5e3098c892f22fae4.tar.gz \
- && cd restinio-a7a10e419d9089c5b8ee63f5e3098c892f22fae4/dev \
+ && wget https://github.com/aberaud/restinio/archive/2c0b6f5e5ba04d7a74e8406a3df1fd433680599d.tar.gz \
+ && ls -l && tar -xzf 2c0b6f5e5ba04d7a74e8406a3df1fd433680599d.tar.gz \
+ && cd restinio-2c0b6f5e5ba04d7a74e8406a3df1fd433680599d/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 . \
&& make -j8 && make install \
- && cd ../../ && rm -rf restinio*
+ && cd ../../.. && rm -rf restinio
diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm
index d54ea85c..a207d304 100644
--- a/docker/DockerfileDepsLlvm
+++ b/docker/DockerfileDepsLlvm
@@ -18,9 +18,9 @@ ENV CXX c++
RUN echo "*** Downloading RESTinio ***" \
&& mkdir restinio && cd restinio \
- && wget https://github.com/aberaud/restinio/archive/a7a10e419d9089c5b8ee63f5e3098c892f22fae4.tar.gz \
- && ls -l && tar -xzf a7a10e419d9089c5b8ee63f5e3098c892f22fae4.tar.gz \
- && cd restinio-a7a10e419d9089c5b8ee63f5e3098c892f22fae4/dev \
+ && wget https://github.com/aberaud/restinio/archive/2c0b6f5e5ba04d7a74e8406a3df1fd433680599d.tar.gz \
+ && ls -l && tar -xzf 2c0b6f5e5ba04d7a74e8406a3df1fd433680599d.tar.gz \
+ && cd restinio-2c0b6f5e5ba04d7a74e8406a3df1fd433680599d/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 . \
--
GitLab