Commit f4e4cac0 authored by Andrew Brooks's avatar Andrew Brooks
Browse files

dockerTools: Correctly unpack duplicate rootfs diffs 

This PR addresses issue #214434 by preventing
dockerTools.buildImage from deleting rootfs diffs until after
they've been unpacked.
parent 6f63865c

pkgs/build-support/docker/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -259,13 +259,14 @@ rec { 


            mkdir -p image/$extractionID/layer

            tar -C image/$extractionID/layer -xpf image/$layerTar

            rm image/$layerTar



            find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;



            # Get the next lower directory and continue the loop.

            lowerdir=image/$extractionID/layer''${lowerdir:+:}$lowerdir

          done

          # Don't remove tarballs until all unpacked in case some are used more than once

          awk '{print "image/"$0}' layer-list | xargs rm -f



          mkdir work

          mkdir layer