diff options
| author | Graham Christensen <graham@grahamc.com> | 2019-03-27 15:54:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 15:54:22 -0400 |
| commit | 6af317616e2a771793a58c7eda6822691f3500e6 (patch) | |
| tree | 7f740a1dcd5cb4bd1c0792b196e792117b20d3ff /pkgs | |
| parent | 431d8e30383d1dffdbeb7ebb59953998566f954b (diff) | |
| parent | 1b1e23024ba24e3df85ede12d6a1f30f871dcb10 (diff) | |
| download | nixlib-6af317616e2a771793a58c7eda6822691f3500e6.tar nixlib-6af317616e2a771793a58c7eda6822691f3500e6.tar.gz nixlib-6af317616e2a771793a58c7eda6822691f3500e6.tar.bz2 nixlib-6af317616e2a771793a58c7eda6822691f3500e6.tar.lz nixlib-6af317616e2a771793a58c7eda6822691f3500e6.tar.xz nixlib-6af317616e2a771793a58c7eda6822691f3500e6.tar.zst nixlib-6af317616e2a771793a58c7eda6822691f3500e6.zip | |
Merge pull request #58431 from alexbiehl/alex/nix-layers
dockerTools: align generated layer archives with docker's output
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 2 | ||||
| -rwxr-xr-x | pkgs/build-support/docker/store-path-to-layer.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 6efb447e1424..3ac376e267e5 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -344,7 +344,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tar -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . + tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . # Compute a checksum of the tarball. echo "Computing layer checksum..." diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh index ff814c1f6130..4cf338b9b252 100755 --- a/pkgs/build-support/docker/store-path-to-layer.sh +++ b/pkgs/build-support/docker/store-path-to-layer.sh @@ -9,6 +9,7 @@ layerPath="./layers/$layerNumber" echo "Creating layer #$layerNumber for $@" mkdir -p "$layerPath" +tar --no-recursion -rf "$layerPath/layer.tar" /nix /nix/store tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 "$@" |