diff options
| author | Shea Levy <shea@shealevy.com> | 2020-05-24 08:34:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 08:34:42 -0400 |
| commit | fffa6e8c1872d8e6f7dfb94577b871a2952505d4 (patch) | |
| tree | 25d002d2603c5cb18225275aafb8aad7d38dcc5c /pkgs/build-support | |
| parent | 196cc470050dc0764d094df39c0317bb3147dbac (diff) | |
| parent | 886c92332c8c9ecf62de9ab12789a6c4ee5207fc (diff) | |
| download | nixlib-fffa6e8c1872d8e6f7dfb94577b871a2952505d4.tar nixlib-fffa6e8c1872d8e6f7dfb94577b871a2952505d4.tar.gz nixlib-fffa6e8c1872d8e6f7dfb94577b871a2952505d4.tar.bz2 nixlib-fffa6e8c1872d8e6f7dfb94577b871a2952505d4.tar.lz nixlib-fffa6e8c1872d8e6f7dfb94577b871a2952505d4.tar.xz nixlib-fffa6e8c1872d8e6f7dfb94577b871a2952505d4.tar.zst nixlib-fffa6e8c1872d8e6f7dfb94577b871a2952505d4.zip | |
Merge pull request #88762 from alexbiehl/alex/docker-tools
dockerTools: Properly add /nix/ and /nix/store/ first to layer.tar
Diffstat (limited to 'pkgs/build-support')
| -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 |