pyrox.dev
lol
Merge pull request #14722 from puffnfresh/bug/dockertools-postmount
dockerTools: only add "/nix" if it exists
zimbatm.tngl.sh
+8
-5
+8
-5
pkgs/build-support/docker/default.nix
+8
-5
pkgs/build-support/docker/default.nix
···
286
286
cp ${layer}/* temp/
287
287
chmod ug+w temp/*
288
288
289
-
# FIXME: might not be /nix/store
290
-
echo '/nix' >> layerFiles
291
-
echo '/nix/store' >> layerFiles
292
289
for dep in $(cat $layerClosure); do
293
-
find $dep >> layerFiles
290
+
find $dep -path "${layer}" -prune -o -print >> layerFiles
294
291
done
295
292
293
+
if [ -s layerFiles ]; then
294
+
# FIXME: might not be /nix/store
295
+
echo '/nix' >> layerFiles
296
+
echo '/nix/store' >> layerFiles
297
+
fi
298
+
296
299
echo Adding layer
297
300
tar -tf temp/layer.tar >> baseFiles
298
301
sed 's/^\.//' -i baseFiles
299
-
comm <(sort -n baseFiles|uniq) <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles
302
+
comm <(sort -u baseFiles) <(sort -u layerFiles) -1 -3 > newFiles
300
303
tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles 2>/dev/null || true
301
304
302
305
echo Adding meta