[nix] replace streamLayeredImage to buildImage

Proot have too many bugs to be fixed, it is better to use qemu to build the docker image. Signed-off-by: Avimitin <[email protected]>
chipsalliance · May 27, 2024 · c81eed8 · c81eed8
1 parent c44bc92
commit c81eed8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/nix/t1/release/default.nix b/nix/t1/release/default.nix
@@ -50,7 +50,7 @@ lib.makeScope newScope (scope: rec {
         --add-flags "--emulator-path ${ip.emu-trace}/bin/emulator"
     '';
 
-  docker-layers = scope.callPackage ./docker-layers.nix { };
+  docker-image = scope.callPackage ./docker-image.nix { };
 
   doc = stdenvNoCC.mkDerivation {
     name = "${configName}-typst-release-doc";

diff --git a/nix/t1/release/docker-layers.nix → nix/t1/release/docker-image.nix b/nix/t1/release/docker-layers.nix → nix/t1/release/docker-image.nix
@@ -1,7 +1,9 @@
 { lib
   # build deps
 , dockerTools
+, buildEnv
 , runCommand
+, runtimeShell
 
   # Runtime deps
 , bashInteractive
@@ -17,24 +19,27 @@
 }:
 
 let
-  # Don't use buildImage which relies on KVM feature
-  self = dockerTools.streamLayeredImage {
+  # dockerTools.buildImage relies on KVM feature, don't run it inside VMs
+  self = dockerTools.buildImage rec {
     name = "chipsalliance/t1-${configName}";
     tag = "latest";
 
-    contents = with dockerTools; [
-      usrBinEnv
-      binSh
+    copyToRoot = buildEnv {
+      name = "${name}.imageroot";
+      paths = with dockerTools; [
+        usrBinEnv
+        binSh
 
-      bashInteractive
-      which
+        bashInteractive
+        which
 
-      emulator-wrapped
-    ]
-    ++ rv32-stdenv.initialPath;
+        emulator-wrapped
+      ] ++ rv32-stdenv.initialPath;
+      pathsToLink = [ "/bin" ];
+    };
 
-    enableFakechroot = true;
-    fakeRootCommands = ''
+    runAsRoot = ''
+      #!${runtimeShell}
       echo "Start finalizing rootfs"
 
       echo "Creating testcase directory"
@@ -53,14 +58,6 @@ let
       # Cmd = [ ];
       WorkingDir = "/workspace";
     };
-
-    passthru = {
-      final-image = runCommand "convert-layer-to-final-image" { } ''
-        mkdir $out
-
-        ${bashInteractive}/bin/bash ${self} > $out/image.tar
-      '';
-    };
   };
 in
 self