diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps index 544d4097c..832014179 100644 --- a/docker/DockerfileDeps +++ b/docker/DockerfileDeps @@ -10,12 +10,14 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ build-essential pkg-config cmake git wget \ libtool autotools-dev autoconf \ - cython3 python3-dev python3-setuptools python3-build python3-virtualenv \ + python3-pip python3-dev python3-setuptools python3-build python3-virtualenv \ 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 && rm -rf /var/lib/apt/lists/* /var/cache/apt/* +RUN pip3 install meson Cython + RUN echo "*** Downloading RESTinio ***" \ && mkdir restinio && cd restinio \ && wget https://github.com/aberaud/restinio/archive/6fd08b65f6f15899dd0de3c801f6a5462b811c64.tar.gz \ diff --git a/docker/DockerfileDepsBionic b/docker/DockerfileDepsBionic index 559264df0..02565bd66 100644 --- a/docker/DockerfileDepsBionic +++ b/docker/DockerfileDepsBionic @@ -5,12 +5,12 @@ LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendh 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 \ + libgnutls28-dev libuv1-dev python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev \ libargon2-0-dev \ 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 pip3 install --upgrade cmake +RUN pip3 install --upgrade cmake meson Cython # libasio-dev (1.10) is too old RUN echo "** Building a recent version of asio ***" \ diff --git a/docker/DockerfileDepsFocal b/docker/DockerfileDepsFocal index a031091a3..43d580168 100644 --- a/docker/DockerfileDepsFocal +++ b/docker/DockerfileDepsFocal @@ -10,12 +10,14 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ build-essential pkg-config cmake git wget \ libtool autotools-dev autoconf \ - cython3 python3-dev python3-setuptools \ + python3-dev python3-setuptools python3-pip \ 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 && rm -rf /var/lib/apt/lists/* /var/cache/apt/* +RUN pip3 install meson Cython + RUN echo "*** Downloading RESTinio ***" \ && mkdir restinio && cd restinio \ && wget https://github.com/aberaud/restinio/archive/e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \ diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm index 85f6ce8d6..c6457b007 100644 --- a/docker/DockerfileDepsLlvm +++ b/docker/DockerfileDepsLlvm @@ -10,13 +10,15 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update \ && apt-get install -y llvm llvm-dev lldb clang gdb make cmake pkg-config \ libtool git wget libncurses5-dev libreadline-dev \ - nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libjsoncpp-dev cython3 python3-dev \ + nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libjsoncpp-dev python3-dev \ python3-setuptools libcppunit-dev python3-pip python3-build python3-virtualenv \ 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 && rm -rf /var/lib/apt/lists/* /var/cache/apt/* +RUN pip3 install meson Cython + ENV CC cc ENV CXX c++