dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #14722 from puffnfresh/bug/dockertools-postmount

Browse Source 
dockerTools: only add "/nix" if it exists
This commit is contained in:
zimbatm 2016-05-06 17:40:23 +01:00
commit 4ba7767d91
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/build-support/docker/default.nix
View File

@ -286,17 +286,20 @@ EOF
cp ${layer}/* temp/ cp ${layer}/* temp/
chmod ug+w temp/* chmod ug+w temp/*
for dep in $(cat $layerClosure); do
find $dep -path "${layer}" -prune -o -print >> layerFiles
done
if [ -s layerFiles ]; then
# FIXME: might not be /nix/store # FIXME: might not be /nix/store
echo '/nix' >> layerFiles echo '/nix' >> layerFiles
echo '/nix/store' >> layerFiles echo '/nix/store' >> layerFiles
for dep in $(cat $layerClosure); do fi
find $dep >> layerFiles
done
echo Adding layer echo Adding layer
tar -tf temp/layer.tar >> baseFiles tar -tf temp/layer.tar >> baseFiles
sed 's/^\.//' -i baseFiles sed 's/^\.//' -i baseFiles
comm <(sort -n baseFiles|uniq) <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles comm <(sort -u baseFiles) <(sort -u layerFiles) -1 -3 > newFiles
tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles 2>/dev/null || true tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles 2>/dev/null || true
echo Adding meta echo Adding meta