Add docker image builder in nix

Author: timower

.github/workflows/docker-image.yml

@@ -10,62 +10,73 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    outputs:
-      linux-image: ${{ steps.meta.outputs.tags }}
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+  # build-linux:
+  #   runs-on: ubuntu-latest
+  #   permissions:
+  #     contents: read
+  #     packages: write
+  #   outputs:
+  #     linux-image: ${{ steps.meta.outputs.tags }}
+  #   steps:
+  #     - name: Set up Docker Buildx
+  #       uses: docker/setup-buildx-action@v3
 
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+  #     - name: Login to GitHub Container Registry
+  #       uses: docker/login-action@v3
+  #       with:
+  #         registry: ${{ env.REGISTRY }}
+  #         username: ${{ github.actor }}
+  #         password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-linux
+  #     - name: Docker meta
+  #       id: meta
+  #       uses: docker/metadata-action@v5
+  #       with:
+  #         images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-linux
 
-      - name: Build
-        uses: docker/build-push-action@v5
-        with:
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          target: linux-build
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+  #     - name: Build
+  #       uses: docker/build-push-action@v5
+  #       with:
+  #         push: ${{ github.event_name != 'pull_request' }}
+  #         tags: ${{ steps.meta.outputs.tags }}
+  #         target: linux-build
+  #         cache-from: type=gha
+  #         cache-to: type=gha,mode=max
 
   build:
     runs-on: ubuntu-latest
-    needs: [build-linux]
+    # needs: [build-linux]
     permissions:
       contents: read
       packages: write
     strategy:
       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
+        with:
+          # Have to use docker as we load an external image.
+          # Prevents using cache
+          driver: docker
+
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v31
+      - name: Nix Build
+        run: |
+          nix build '.#"docker-${{ matrix.os.version }}"'
+          ./result | docker image load
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -89,10 +100,10 @@ jobs:
           push: ${{ github.event_name != 'pull_request' && github.ref_name == 'main' }}
           tags: ${{ steps.meta.outputs.tags }}
           target: ${{ matrix.os.target }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          # cache-from: type=gha
+          # cache-to: type=gha,mode=max
+          # linux_image=${{ needs.build-linux.outputs.linux-image }}
           build-args: |
             fw_version=${{ matrix.os.version }}
-            linux_image=${{ needs.build-linux.outputs.linux-image }}
 
 

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
         ]
       }