]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: keep intermediate docker build layers 3842/head
authorLoic Dachary <ldachary@redhat.com>
Mon, 2 Mar 2015 13:37:55 +0000 (14:37 +0100)
committerLoic Dachary <ldachary@redhat.com>
Mon, 2 Mar 2015 13:37:55 +0000 (14:37 +0100)
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 <ldachary@redhat.com>
src/test/docker-test-helper.sh

index c2b3cdb507d26a7381bbf831c25ea5b01306eeef..d64552484966c80494691a04bc864c123b6549aa 100755 (executable)
@@ -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
 }