summary refs log tree commit diff
path: root/pkgs/build-support/docker
diff options
context:
space:
mode:
authorAlex Biehl <alex.biehl@target.com>2019-03-27 11:34:35 +0100
committerAlex Biehl <alex.biehl@target.com>2019-03-27 11:35:27 +0100
commit096e3cbdec300579ad6f46f056e1dc5427617a35 (patch)
tree499d5e73c44347b6a13b3227f453194adb9d785b /pkgs/build-support/docker
parent7205c1ee3e602bd854a8ff9f771afe2bdb0eb9c7 (diff)
downloadnixpkgs-096e3cbdec300579ad6f46f056e1dc5427617a35.tar
nixpkgs-096e3cbdec300579ad6f46f056e1dc5427617a35.tar.gz
nixpkgs-096e3cbdec300579ad6f46f056e1dc5427617a35.tar.bz2
nixpkgs-096e3cbdec300579ad6f46f056e1dc5427617a35.tar.lz
nixpkgs-096e3cbdec300579ad6f46f056e1dc5427617a35.tar.xz
nixpkgs-096e3cbdec300579ad6f46f056e1dc5427617a35.tar.zst
nixpkgs-096e3cbdec300579ad6f46f056e1dc5427617a35.zip
Add /nix/store to each layer.tar
To be totally consistent with the way Docker builds images we need to
include the /nix/store in the layer tarballs first.
Diffstat (limited to 'pkgs/build-support/docker')
-rwxr-xr-xpkgs/build-support/docker/store-path-to-layer.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh
index ff814c1f613..4cf338b9b25 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 "$@"