From 70fdbc01e1ce74f993170cfd0fd423de5d6a4b1d Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Mon, 2 Mar 2015 14:37:55 +0100 Subject: [PATCH] tests: keep intermediate docker build layers Because the docker devmapper backend has an intermittent bug https://github.com/docker/docker/issues/4036 the build of the image will sometime fail. It will eventually succeed if the command is repeated enough times. Not removing the intermediate layers helps speed up the operation: when repeating the command, only the layer that failed because of the above bug is rebuilt. Signed-off-by: Loic Dachary --- src/test/docker-test-helper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/docker-test-helper.sh b/src/test/docker-test-helper.sh index c2b3cdb507d26..d64552484966c 100755 --- a/src/test/docker-test-helper.sh +++ b/src/test/docker-test-helper.sh @@ -48,7 +48,7 @@ function setup_container() { os_version=$os_version user_id=$(id -u) \ perl -p -e 's/%%(\w+)%%/$ENV{$1}/g' \ dockerfile/Dockerfile.in > dockerfile/Dockerfile - docker $opts build --rm=true --tag=$image dockerfile + docker $opts build --tag=$image dockerfile rm -fr dockerfile fi } -- 2.39.5