From 3074b6d5a25d9f49c06957c5f1066769cf5651ef Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Sat, 10 Apr 2021 08:05:02 +0100 Subject: [PATCH] Dockerfile: re-build criu after clean In order to be able to run the zdtm tests inside a container, we have to make sure that all protobuf sources have been compiled. Signed-off-by: Radostin Stoyanov --- scripts/build/Dockerfile.tmpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl index 5f045c917..66e3d8c59 100644 --- a/scripts/build/Dockerfile.tmpl +++ b/scripts/build/Dockerfile.tmpl @@ -39,7 +39,8 @@ RUN git clean -dfx && date && \ make mrproper && ! git clean -ndx --exclude=scripts/build \ --exclude=.config --exclude=test | grep . -# Compile tests -RUN date && make -j $(nproc) CC="$CC" -C test/zdtm && date +# Re-compile criu and compile tests for 'make docker-test' +RUN make -j $(nproc) CC="$CC" && \ + date && make -j $(nproc) CC="$CC" -C test/zdtm && date #RUN make test/compel/handle_binary && ./test/compel/handle_binary