Unverified Commit 2834c0cf authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

Merge pull request #268458 from Mic92/dockertools

nixos/dockerTools: fixup proot/fakeroot code (fixes dockertools nixos test)
parents 6104170b 49119155
Loading
Loading
Loading
Loading
+24 −11
Original line number Diff line number Diff line
@@ -914,17 +914,30 @@ rec {
            (cd old_out; eval "$extraCommands" )

            mkdir $out
            ${optionalString enableFakechroot ''proot -r $PWD/old_out ${bind-paths} --pwd=/ ''}fakeroot bash -c '
            ${if enableFakechroot then ''
              proot -r $PWD/old_out ${bind-paths} --pwd=/ --root-id bash -c '
                source $stdenv/setup
              ${optionalString (!enableFakechroot) ''cd old_out''}
                eval "$fakeRootCommands"
                tar \
                  --sort name \
                  --exclude=./proc \
                  --exclude=./sys \
                  --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \
                  --hard-dereference \
                  -cf $out/layer.tar .
              '

            '' else ''
              fakeroot bash -c '
                source $stdenv/setup
                cd old_out
                eval "$fakeRootCommands"
                tar \
                  --sort name \
                  --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \
                  --hard-dereference \
                  -cf $out/layer.tar .
              '
            ''}
            sha256sum $out/layer.tar \
              | cut -f 1 -d ' ' \
              > $out/checksum