From 366f76986f0258dc70050977a9ae031996b0654e Mon Sep 17 00:00:00 2001
From: Seva <seva@binarytrails.net>
Date: Thu, 15 Aug 2019 16:38:53 -0400
Subject: [PATCH] docker: bump restinio & replace sed fix by new var
---
docker/DockerfileDeps | 12 ++++--------
docker/DockerfileDepsLlvm | 12 ++++--------
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps
index 3b80f417..f5c751e4 100644
--- a/docker/DockerfileDeps
+++ b/docker/DockerfileDeps
@@ -21,16 +21,12 @@ RUN apt-get update && apt-get install -y python3-pip \
RUN echo "*** Downloading RESTinio ***" \
&& mkdir restinio && cd restinio \
- && wget https://github.com/Stiffstream/restinio/archive/v.0.5.1.tar.gz \
- && ls -l && tar -xzf v.0.5.1.tar.gz \
- && cd restinio-v.0.5.1/dev \
- && sed -i.bak '/find_package(Boost*/d' CMakeLists.txt \
- && sed -i.bak '/find_package(PCRE)/d' CMakeLists.txt \
- && sed -i.bak '/find_package(PCRE2)/d' CMakeLists.txt \
- && sed -i.bak '/add_subdirectory(so_5)/d' CMakeLists.txt \
+ && wget https://github.com/Stiffstream/restinio/archive/v.0.5.1.1.tar.gz \
+ && ls -l && tar -xzf v.0.5.1.1.tar.gz \
+ && cd restinio-v.0.5.1.1/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_USE_BOOST_ASIO=none . \
+ -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
&& cd ../../ && rm -rf restinio*
#build msgpack from source
diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm
index 3a43ea8b..a005b552 100644
--- a/docker/DockerfileDepsLlvm
+++ b/docker/DockerfileDepsLlvm
@@ -23,16 +23,12 @@ RUN apt-get update && apt-get install -y python3-pip \
RUN echo "*** Downloading RESTinio ***" \
&& mkdir restinio && cd restinio \
- && wget https://github.com/Stiffstream/restinio/archive/v.0.5.1.tar.gz \
- && ls -l && tar -xzf v.0.5.1.tar.gz \
- && cd restinio-v.0.5.1/dev \
- && sed -i.bak '/find_package(Boost*/d' CMakeLists.txt \
- && sed -i.bak '/find_package(PCRE)/d' CMakeLists.txt \
- && sed -i.bak '/find_package(PCRE2)/d' CMakeLists.txt \
- && sed -i.bak '/add_subdirectory(so_5)/d' CMakeLists.txt \
+ && wget https://github.com/Stiffstream/restinio/archive/v.0.5.1.1.tar.gz \
+ && ls -l && tar -xzf v.0.5.1.1.tar.gz \
+ && cd restinio-v.0.5.1.1/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_USE_BOOST_ASIO=none . \
+ -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
&& cd ../../ && rm -rf restinio*
#build msgpack from source
--
GitLab