diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2020-11-05 00:17:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 00:17:36 +0100 |
| commit | 06df74607fb8d4167666c686c81f310b55debd7e (patch) | |
| tree | 8811b40e2bce43cf1b8f80b91371966acb25d7bc /pkgs/build-support | |
| parent | 18d375cae7df73383db7382d9704ac4beab875a2 (diff) | |
| parent | 24c5059468026eb8df4c77e98192567378656bc3 (diff) | |
Merge pull request #101403 from mickours
Fix broken pipe error on docker layer creation
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 35382662cf81..ba76ce2b817d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -340,7 +340,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee $out/layer.tar | tarsum) + tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee -p $out/layer.tar | tarsum) # Add a 'checksum' field to the JSON, with the value set to the # checksum of the tarball. @@ -425,7 +425,7 @@ rec { echo "Packing layer..." mkdir -p $out tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf - . | - tee $out/layer.tar | + tee -p $out/layer.tar | ${tarsum}/bin/tarsum) cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json |