From 1ab4190b1358402f4b0183530ab53a9b5077e5d8 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 9 May 2018 09:32:16 +0200 Subject: [PATCH] docker: do not rely on submodules for building docker image --- packaging/docker/Dockerfile.dev | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packaging/docker/Dockerfile.dev b/packaging/docker/Dockerfile.dev index de0b83736..04bdd0638 100644 --- a/packaging/docker/Dockerfile.dev +++ b/packaging/docker/Dockerfile.dev @@ -87,8 +87,11 @@ RUN dnf -y install \ mosquitto-devel # Build & Install Criterion -COPY thirdparty/criterion /tmp/criterion -RUN mkdir -p /tmp/criterion/build && cd /tmp/criterion/build && cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && rm -rf /tmp/* +RUN cd /tmp && \ + git clone --recursive https://github.com/Snaipe/Criterion && \ + mkdir -p Criterion/build && cd Criterion/build && \ + cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \ + rm -rf /tmp/* # Workaround for libnl3's search path for netem distributions RUN ln -s /usr/lib64/tc /usr/lib/tc