Add docker image builder in nix

Author: timower

.github/workflows/docker-image.yml

@@ -53,20 +53,23 @@ jobs:
       matrix:
         os:
           - version: '2.15.1.1189'
-            target: qemu-toltec
-          - version: '3.3.2.1666'
-            target: qemu-toltec
-          - version: '3.5.2.1807'
-            target: qemu-toltec
-          - version: '3.8.2.1965'
-            target: qemu-toltec
-          - version: '3.20.0.92'
-            target: qemu-toltec
+            target: nix-toltec
+          # - version: '3.3.2.1666'
+          #   target: qemu-toltec
+          # - version: '3.5.2.1807'
+          #   target: qemu-toltec
+          # - version: '3.8.2.1965'
+          #   target: qemu-toltec
+          # - version: '3.20.0.92'
+          #   target: qemu-toltec
 
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v31
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -83,6 +86,12 @@ jobs:
             latest=auto
             suffix=-${{matrix.os.target}}-${{ matrix.os.version }},onlatest=true
 
+      - name: Nix Build
+        run: |
+          nix build .#"docker-${{ matrix.os.version }}"
+          ./result | docker image load
+
+
       - name: Build
         uses: docker/build-push-action@v5
         with:

Dockerfile

@@ -182,7 +182,7 @@ RUN nix build "/src#\"rm-emu-$fw_version\"" -o /result && \
 
 CMD run_vm
 
-FROM nix-emu AS nix-start
+FROM rm-emu:$fw_version AS nix-start
 
 # First boot, disable xochitl and reboot service, and save state
 RUN run_vm -serial null -daemonize && \

bin/run_vm

@@ -10,6 +10,7 @@ ssh_port=${SSH_PORT:-22}
 
 if ! [ -f "$root_path" ] && [ -f "$backing_path" ]; then
   echo "No image found, creating new one"
+  mkdir -p $(dirname $root_path)
   qemu-img create -b "$backing_path" -F qcow2 -f qcow2 "$root_path"
 fi
 

flake.nix

@@ -41,13 +41,33 @@
               inherit kernel rootfs;
             })
           ) allRootFs;
+
+          dockerImages = nixpkgs.lib.mapAttrs' (
+            _: pkg:
+            nixpkgs.lib.nameValuePair "docker-${pkg.version}" (
+              pkgs.dockerTools.streamLayeredImage {
+                name = "rm-emu";
+                tag = "${pkg.version}";
+                contents = [
+                  pkg
+                  pkgs.dockerTools.binSh
+                  pkgs.dockerTools.fakeNss
+                ];
+
+                config = {
+                  Cmd = [ "${pkg}/bin/run_vm" ];
+                };
+              }
+            )
+          ) allEmus;
         in
         {
           inherit kernel extractor;
           default = allEmus."rm-emu-3.20.0.92";
         }
         // allEmus
         // allRootFs'
+        // dockerImages
       );
     };
 }

nix/rm-emu.nix

@@ -83,6 +83,7 @@ stdenvNoCC.mkDerivation {
         lib.makeBinPath [
           qemu
           gnugrep
+          coreutils
         ]
       }