[CRIU] [PATCH 02/10] Dockerfile.fedora-asan: fixes

Kir Kolyshkin kolyshkin at gmail.com
Mon Oct 2 03:33:57 MSK 2017


1. Don't ignore failures. This is same as commit e4000c59a71 ("Dockerfiles:
don't ignore make failures"). Seems that Dockerfile.fedora-asan copy/pasted
an old version of it.

2. Consolidate 3 RUN commands into 1, we don't want extra docker layers.
While at it, beautify the list of packages.

3. Fix for clang (use $CC in package list).

Signed-off-by: Kir Kolyshkin <kolyshkin at gmail.com>
---
 scripts/build/Dockerfile.fedora-asan | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Dockerfile.fedora-asan b/scripts/build/Dockerfile.fedora-asan
index 13aad28a..5db43075 100644
--- a/scripts/build/Dockerfile.fedora-asan
+++ b/scripts/build/Dockerfile.fedora-asan
@@ -10,7 +10,7 @@ COPY . /criu
 WORKDIR /criu
 
 ENV CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
-RUN mv .ccache /tmp; make mrproper; ccache -s; \
-	date; make -j $(nproc) ASAN=1 CC="$CC"; date
+RUN mv .ccache /tmp && make mrproper && ccache -s && \
+	date && make -j $(nproc) ASAN=1 CC="$CC" && date
 RUN make ASAN=1 -C test/zdtm -j $(nproc)
 
-- 
2.14.1



More information about the CRIU mailing list