dockerTools.buildLayeredImage: Avoid appending to tarballs when building layers

Appending to an existing tar archive repeatedly seems to be a quadratic
operation, since tar seems to traverse the existing archive even using
the `-r, --append` flag. This commit avoids that by passing the list of
files to a single tar invocation.

1 files changed, 6 insertions, 8 deletions

diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh
index 7e8efeea1c1..e9fa22e4b99 100755
--- a/pkgs/build-support/docker/store-path-to-layer.sh
+++ b/pkgs/build-support/docker/store-path-to-layer.sh
@@ -32,15 +32,13 @@ tar -cf "$layerPath/layer.tar"  \
 # to /nix/store. In order to create the correct structure
 # in the tar file, we transform the relative nix store
 # path to the absolute store path.
-for storePath in "$@"; do
-  n=$(basename "$storePath")
+basename -a "$@" |
   tar -C /nix/store -rpf "$layerPath/layer.tar" \
-      --hard-dereference --sort=name \
-      --mtime="@$SOURCE_DATE_EPOCH" \
-      --owner=0 --group=0 \
-      --transform="s,$n,/nix/store/$n," \
-      $n
-done
+    --verbatim-files-from --files-from - \
+    --hard-dereference --sort=name \
+    --mtime="@$SOURCE_DATE_EPOCH" \
+    --owner=0 --group=0 \
+    --transform="flags=rS;s,^,/nix/store/,"
 
 # Compute a checksum of the tarball.
 tarhash=$(tarsum < $layerPath/layer.tar)