From b012fe5e7ea86ef0f4de88ec80fa0e65113e1146 Mon Sep 17 00:00:00 2001 From: divanorama Date: Fri, 10 Sep 2021 19:12:32 +0200 Subject: [PATCH] use --verbatim-files-from in dockerTools https://www.gnu.org/software/tar/manual/html_node/files.html files starting with - can be treated as command line options, which isn't desirable here --- pkgs/build-support/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 9e4709dd9bf8..4bda4d2a5c23 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -636,7 +636,7 @@ rec { <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles # Append the new files to the layer. tar -rpf temp/layer.tar --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ - --owner=0 --group=0 --no-recursion --files-from newFiles + --owner=0 --group=0 --no-recursion --verbatim-files-from --files-from newFiles echo "Adding meta..."