diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps index 19abd98b576f29ad16e19f3f2cf9504762ef4add..ed0f55821420d6e9bda2a27e1ad70758704e52e3 100644 --- a/docker/DockerfileDeps +++ b/docker/DockerfileDeps @@ -1,9 +1,3 @@ -FROM ubuntu:16.04 +FROM ubuntu:17.04 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 libgnutls-dev cython3 python3-dev python3-setuptools && apt-get clean -RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-2.0.0/msgpack-2.0.0.tar.gz \ - && tar -xzf msgpack-2.0.0.tar.gz \ - && cd msgpack-2.0.0 && mkdir build && cd build \ - && cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \ - && make -j8 && make install \ - && cd ../.. && rm -rf msgpack-2.0.0 msgpack-2.0.0.tar.gz +RUN apt-get update && apt-get install -y build-essential cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libargon2-0-dev cython3 python3-dev python3-setuptools && apt-get clean \ No newline at end of file diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm index 418f9945d3fc2f6d2a1efbac00b1e063f309e385..1e551c63ba8a9909df20e6eceabfbdff213cbe08 100644 --- a/docker/DockerfileDepsLlvm +++ b/docker/DockerfileDepsLlvm @@ -1,13 +1,7 @@ -FROM ubuntu:16.04 +FROM ubuntu:17.04 MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com> RUN apt-get update \ - && apt-get install -y llvm llvm-dev clang make cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls-dev cython3 python3-dev python3-setuptools \ + && apt-get install -y llvm llvm-dev clang make cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls28-dev libuv1-dev libargon2-0-dev cython3 python3-dev python3-setuptools \ && apt-get remove -y gcc g++ && apt-get autoremove -y && apt-get clean ENV CC cc -ENV CXX c++ -RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-2.0.0/msgpack-2.0.0.tar.gz \ - && tar -xzf msgpack-2.0.0.tar.gz \ - && cd msgpack-2.0.0 && mkdir build && cd build \ - && cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \ - && make -j8 && make install \ - && cd ../.. && rm -rf msgpack-2.0.0 msgpack-2.0.0.tar.gz +ENV CXX c++ \ No newline at end of file