diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:28 +0200 |
| commit | 362d88c2b19e3857576b2571722dc66c381c185a (patch) | |
| tree | 7dc706e1918e7dc1e9762573831c851be4343559 /pkgs/build-support/docker/store-path-to-layer.sh | |
| parent | 0367fa630d59673624d6742e2758b87eb12fff4c (diff) | |
| parent | 1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e (diff) | |
| download | nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.gz nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.bz2 nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.lz nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.xz nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.zst nixlib-362d88c2b19e3857576b2571722dc66c381c185a.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support/docker/store-path-to-layer.sh')
| -rwxr-xr-x | pkgs/build-support/docker/store-path-to-layer.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh index d834716e4b21..7437da51cc4a 100755 --- a/pkgs/build-support/docker/store-path-to-layer.sh +++ b/pkgs/build-support/docker/store-path-to-layer.sh @@ -30,12 +30,13 @@ mkdir -p nix/store # store path to the absolute store path. tarhash=$( basename -a "$@" | - tar -cp nix \ - -C /nix/store --verbatim-files-from --files-from - \ + tar --create --preserve-permissions --absolute-names nix \ + --directory /nix/store --verbatim-files-from --files-from - \ --hard-dereference --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 \ - --transform 's,^nix(/|$),/nix/,' \ + --transform 's,^nix$,/\0,' \ + --transform 's,^nix/store$,/\0,' \ --transform 's,^[^/],/nix/store/\0,rS' | tee "$layerPath/layer.tar" | tarsum |