diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-05-06 17:40:23 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-05-06 17:40:23 +0100 |
| commit | 4ba7767d91ffc4bd18c6d3793e90f3d59ee09a3f (patch) | |
| tree | 369904460a7a7c8a179960789cb9f5a96c34ff46 | |
| parent | 53a45825523566b8c9c5ff135e8ff75e05558d85 (diff) | |
| parent | 0167b61ef45c3cf8223d67893956144c65d811bf (diff) | |
| download | nixlib-4ba7767d91ffc4bd18c6d3793e90f3d59ee09a3f.tar nixlib-4ba7767d91ffc4bd18c6d3793e90f3d59ee09a3f.tar.gz nixlib-4ba7767d91ffc4bd18c6d3793e90f3d59ee09a3f.tar.bz2 nixlib-4ba7767d91ffc4bd18c6d3793e90f3d59ee09a3f.tar.lz nixlib-4ba7767d91ffc4bd18c6d3793e90f3d59ee09a3f.tar.xz nixlib-4ba7767d91ffc4bd18c6d3793e90f3d59ee09a3f.tar.zst nixlib-4ba7767d91ffc4bd18c6d3793e90f3d59ee09a3f.zip | |
Merge pull request #14722 from puffnfresh/bug/dockertools-postmount
dockerTools: only add "/nix" if it exists
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index f874354b15ed..5ead82dee8b5 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -286,17 +286,20 @@ EOF cp ${layer}/* temp/ chmod ug+w temp/* - # FIXME: might not be /nix/store - echo '/nix' >> layerFiles - echo '/nix/store' >> layerFiles for dep in $(cat $layerClosure); do - find $dep >> layerFiles + find $dep -path "${layer}" -prune -o -print >> layerFiles done + if [ -s layerFiles ]; then + # FIXME: might not be /nix/store + echo '/nix' >> layerFiles + echo '/nix/store' >> layerFiles + fi + echo Adding layer 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 -u baseFiles) <(sort -u layerFiles) -1 -3 > newFiles tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles 2>/dev/null || true echo Adding meta |