diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps index 94cf4fbf604dc932280eae471318c74941dff86b..1553019e69eb4e3ec652585d1d3c7d75968d4469 100644 --- a/docker/DockerfileDeps +++ b/docker/DockerfileDeps @@ -3,18 +3,18 @@ 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 cython3 python3-dev libcppunit-dev libjsoncpp-dev libasio-dev libssl-dev python3-setuptools python3-pip && apt-get clean #install conan -RUN pip install conan +RUN pip3 install conan #build restinio from source RUN git clone https://github.com/Stiffstream/restinio-conan.git \ && cd restinio-conan/ \ && conan remote add stiffstream https://api.bintray.com/conan/stiffstream/public \ && echo "[requires]" > conanfile.txt \ - && echo "restinio/0.5.0@stiffstream/stable" >> conanfile.txt \ # TODO change for 0.5.1 once released - && git clone https://github.com/Stiffstream/restinio \ # TODO remove once can download with conan ^ - && conan install . --build=missing \ # dependencies > .conan/data/restinio/ + && echo "restinio/0.5.0@stiffstream/stable" >> conanfile.txt \ + && git clone https://github.com/Stiffstream/restinio \ + && conan install . --build=missing \ && conan package --package-folder /usr . \ - && git clone https://github.com/binarytrails/http-parser.git \ # fork for custom methods LISTEN,SIGN,ENCRYPT,STATS + && git clone https://github.com/binarytrails/http-parser.git \ && cd http-parser && make && make install PREFIX=/usr \ && cd ../ && rm -rf restinio-conan/ diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm index 8c980277a54752c180eea92cbbb1cf5c5159ea32..76b3a46a61da870c21d863441ab19cd560d86a4d 100644 --- a/docker/DockerfileDepsLlvm +++ b/docker/DockerfileDepsLlvm @@ -8,18 +8,18 @@ ENV CC cc ENV CXX c++ #install conan -RUN pip install conan +RUN pip3 install conan #build restinio from source RUN git clone https://github.com/Stiffstream/restinio-conan.git \ && cd restinio-conan/ \ && conan remote add stiffstream https://api.bintray.com/conan/stiffstream/public \ && echo "[requires]" > conanfile.txt \ - && echo "restinio/0.5.0@stiffstream/stable" >> conanfile.txt \ # TODO change for 0.5.1 once released - && git clone https://github.com/Stiffstream/restinio \ # TODO remove once can download with conan ^ - && conan install . --build=missing \ # dependencies > .conan/data/restinio/ + && echo "restinio/0.5.0@stiffstream/stable" >> conanfile.txt \ + && git clone https://github.com/Stiffstream/restinio \ + && conan install . --build=missing \ && conan package --package-folder /usr . \ - && git clone https://github.com/binarytrails/http-parser.git \ # fork for custom methods LISTEN,SIGN,ENCRYPT,STATS + && git clone https://github.com/binarytrails/http-parser.git \ && cd http-parser && make && make install PREFIX=/usr \ && cd ../ && rm -rf restinio-conan/