diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2021-09-29 09:34:06 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2021-09-29 09:34:06 +0200 |
| commit | 63bf4539b9eaecee667100197ebf6f2be6522914 (patch) | |
| tree | 1142c3dd5459f70ca43d92682887c90f119efceb /pkgs/build-support/docker | |
| parent | 8863a5199db598b4a0d23c9997a525a9457cbcb7 (diff) | |
| download | nixpkgs-63bf4539b9eaecee667100197ebf6f2be6522914.tar nixpkgs-63bf4539b9eaecee667100197ebf6f2be6522914.tar.gz nixpkgs-63bf4539b9eaecee667100197ebf6f2be6522914.tar.bz2 nixpkgs-63bf4539b9eaecee667100197ebf6f2be6522914.tar.lz nixpkgs-63bf4539b9eaecee667100197ebf6f2be6522914.tar.xz nixpkgs-63bf4539b9eaecee667100197ebf6f2be6522914.tar.zst nixpkgs-63bf4539b9eaecee667100197ebf6f2be6522914.zip | |
dockerTools.runWithOverlay: Avoid cluttering $out and copying
Diffstat (limited to 'pkgs/build-support/docker')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 2d327a9426d..edb8837015c 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -191,13 +191,13 @@ rec { , postMount ? "" , postUmount ? "" }: - let - result = vmTools.runInLinuxVM ( + vmTools.runInLinuxVM ( runCommand name { preVM = vmTools.createEmptyImage { size = diskSize; fullName = "docker-run-disk"; + destination = "./image"; }; inherit fromImage fromImageName fromImageTag; @@ -278,16 +278,6 @@ rec { ${postUmount} ''); - in - runCommand name { } '' - cd ${result} - if [ -e json ] && [ -e VERSION ] ; then - mkdir -p $out - cp layer.tar json VERSION $out - else - cp layer.tar $out - fi - ''; exportImage = { name ? fromImage.name, fromImage, fromImageName ? null, fromImageTag ? null, diskSize ? 1024 }: runWithOverlay { |