mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity

dockerTools: fix difference between base files and layer files

Browse source
This commit is contained in:
Luca Bruno 2016-04-13 23:56:06 +02:00
parent 4d200538c2
commit 44d651485a
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/build-support/docker/default.nix
View file

@ -295,6 +295,7 @@ EOF
echo Adding layer echo Adding layer
tar -tf temp/layer.tar >> baseFiles tar -tf temp/layer.tar >> baseFiles
sed 's/^\.//' -i baseFiles
comm <(sort -n baseFiles|uniq) <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles comm <(sort -n baseFiles|uniq) <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles
tar -rpf temp/layer.tar --no-recursion --files-from newFiles 2>/dev/null || true tar -rpf temp/layer.tar --no-recursion --files-from newFiles 2>/dev/null || true