diff options
| author | lewo <lewo@abesis.fr> | 2018-12-27 11:17:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-27 11:17:51 +0100 |
| commit | 23ebff30a35f638456052f2db4163962b0db56eb (patch) | |
| tree | 5616a5997b7105c2e4e797961fc2341595208ea2 | |
| parent | 17648708130df10c5984af4d252f3cfb001a1827 (diff) | |
| parent | a3c536fcb374387b228c7a270987d6d38d697b86 (diff) | |
| download | nixlib-23ebff30a35f638456052f2db4163962b0db56eb.tar nixlib-23ebff30a35f638456052f2db4163962b0db56eb.tar.gz nixlib-23ebff30a35f638456052f2db4163962b0db56eb.tar.bz2 nixlib-23ebff30a35f638456052f2db4163962b0db56eb.tar.lz nixlib-23ebff30a35f638456052f2db4163962b0db56eb.tar.xz nixlib-23ebff30a35f638456052f2db4163962b0db56eb.tar.zst nixlib-23ebff30a35f638456052f2db4163962b0db56eb.zip | |
Merge pull request #52109 from djahandarie/master
dockerTools.buildImage: fix two bugs introduced in c88337c9aca9d91804da7d1d05960c88e17455c9
| -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 f16cb7cec13a..731dd1ea9929 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 {}' \; |