diff options
| author | Darius Jahandarie <djahandarie@gmail.com> | 2018-12-14 15:48:58 -0500 |
|---|---|---|
| committer | Darius Jahandarie <djahandarie@gmail.com> | 2018-12-14 15:48:58 -0500 |
| commit | a3c536fcb374387b228c7a270987d6d38d697b86 (patch) | |
| tree | 51bdd21fc412da4876d7ae1ed9ddb10f52cc482a /pkgs/build-support/docker | |
| parent | c3c071b78e7c68f94f2a7b1358e9743ef9eb405d (diff) | |
| download | nixpkgs-a3c536fcb374387b228c7a270987d6d38d697b86.tar nixpkgs-a3c536fcb374387b228c7a270987d6d38d697b86.tar.gz nixpkgs-a3c536fcb374387b228c7a270987d6d38d697b86.tar.bz2 nixpkgs-a3c536fcb374387b228c7a270987d6d38d697b86.tar.lz nixpkgs-a3c536fcb374387b228c7a270987d6d38d697b86.tar.xz nixpkgs-a3c536fcb374387b228c7a270987d6d38d697b86.tar.zst nixpkgs-a3c536fcb374387b228c7a270987d6d38d697b86.zip | |
dockerTools.buildImage: fix two bugs introduced in c88337c9aca9d91804da7d1d05960c88e17455c9
Diffstat (limited to 'pkgs/build-support/docker')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index f16cb7cec13..731dd1ea992 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -157,7 +157,7 @@ rec { }; inherit fromImage fromImageName fromImageTag; - buildInputs = [ utillinux e2fsprogs jshon rsync ]; + buildInputs = [ utillinux e2fsprogs jshon rsync jq ]; } '' rm -rf $out @@ -202,8 +202,8 @@ rec { extractionID=$((extractionID + 1)) mkdir -p image/$extractionID/layer - tar -C image/$extractionID/layer -xpf $layerTar - rm $layerTar + tar -C image/$extractionID/layer -xpf image/$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 {}' \; |