git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #52109 from djahandarie/master

dockerTools.buildImage: fix two bugs introduced in c88337c9aca9d91804da7d1d05960c88e17455c9

commit23ebff30a35f638456052f2db4163962b0db56eb authorlewo <lewo@abesis.fr> dateThu 27 Dec 2018, 11:17 (8 years ago) parent1764870a3c536f
1 file changed+3−3
pkgs/build-support/docker/default.nix+3−3
pkgs/build-support/docker/default.nix+3−3
@@ -157,7 +157,7 @@ rec {
157157 };
158158 inherit fromImage fromImageName fromImageTag;
159159
160− buildInputs = [ utillinux e2fsprogs jshon rsync ];
160+ buildInputs = [ utillinux e2fsprogs jshon rsync jq ];
161161 } ''
162162 rm -rf $out
163163
@@ -202,8 +202,8 @@ rec {
202202 extractionID=$((extractionID + 1))
203203
204204 mkdir -p image/$extractionID/layer
205− tar -C image/$extractionID/layer -xpf $layerTar
206− rm $layerTar
205+ tar -C image/$extractionID/layer -xpf image/$layerTar
206+ rm image/$layerTar
207207
208208 find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
209209