public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52109 from djahandarie/master

Browse Source 
dockerTools.buildImage: fix two bugs introduced in c88337c9ac
This commit is contained in:
lewo 2018-12-27 11:17:51 +01:00 committed by GitHub
commit 23ebff30a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ rec {
}; };
inherit fromImage fromImageName fromImageTag; inherit fromImage fromImageName fromImageTag;
buildInputs = [ utillinux e2fsprogs jshon rsync ]; buildInputs = [ utillinux e2fsprogs jshon rsync jq ];
} '' } ''
rm -rf $out rm -rf $out
@ -202,8 +202,8 @@ rec {
extractionID=$((extractionID + 1)) extractionID=$((extractionID + 1))
mkdir -p image/$extractionID/layer mkdir -p image/$extractionID/layer
tar -C image/$extractionID/layer -xpf $layerTar tar -C image/$extractionID/layer -xpf image/$layerTar
rm $layerTar rm image/$layerTar
find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \; find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;