From 63bf4539b9eaecee667100197ebf6f2be6522914 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 29 Sep 2021 09:34:06 +0200
Subject: dockerTools.runWithOverlay: Avoid cluttering $out and copying

---
 pkgs/build-support/docker/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'pkgs/build-support/docker')

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 {
-- 
cgit 1.4.1