From bbce41520fb1ab9923dfe8fb704709e5db00b044 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Wed, 17 Dec 2025 05:50:23 +0100
Subject: [PATCH] More flake checks

---
 extra/admin-api/outputs.nix |  2 +-
 flake.nix                   | 47 ++++++++++++++++++++++++++++---------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/extra/admin-api/outputs.nix b/extra/admin-api/outputs.nix
index 90182efe7..488dd3a6a 100644
--- a/extra/admin-api/outputs.nix
+++ b/extra/admin-api/outputs.nix
@@ -122,7 +122,7 @@ flake-utils.lib.eachSystem flake-utils.lib.allSystems (
     pkgs.lib.recursiveUpdate (pkgs.lib.attrsets.unionOfDisjoint { } self.packages) {
       x86_64-linux = {
         #            spacebar-server-tests = self.packages.x86_64-linux.default.passthru.tests;
-        docker-image = self.containers.x86_64-linux.admin-api;
+        docker-admin-api = self.containers.x86_64-linux.admin-api;
       };
     };
 }
diff --git a/flake.nix b/flake.nix
index 134afe7a2..32eb93a27 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,14 +96,33 @@
               };
             };
 
-            containers.docker = pkgs.dockerTools.buildLayeredImage {
-              name = "spacebar-server-ts";
-              tag = builtins.replaceStrings [ "+" ] [ "_" ] self.packages.${system}.default.version;
-              contents = [ self.packages.${system}.default ];
-              config = {
-                Cmd = [ "${self.outputs.packages.${system}.default}/bin/start-bundle" ];
-                Expose = [ "3001" ];
-              };
+            containers = {
+              docker = {
+                default = pkgs.dockerTools.buildLayeredImage {
+                  name = "spacebar-server-ts";
+                  tag = builtins.replaceStrings [ "+" ] [ "_" ] self.packages.${system}.default.version;
+                  contents = [ self.packages.${system}.default ];
+                  config = {
+                    Cmd = [ "${self.outputs.packages.${system}.default}/bin/start-bundle" ];
+                    Expose = [ "3001" ];
+                  };
+                };
+              }
+              // lib.genAttrs [ "api" "cdn" "gateway" ] (
+                mod:
+                pkgs.dockerTools.buildLayeredImage {
+                  name = "spacebar-server-ts-${mod}";
+                  tag = builtins.replaceStrings [ "+" ] [ "_" ] self.packages.${system}.default.version;
+                  contents = [
+                    self.packages.${system}.default
+                  ];
+                  config = {
+                    Cmd = [ "${self.outputs.packages.${system}.default}/bin/start-${mod}" ];
+                    Expose = [ "3001" ];
+                  };
+
+                }
+              );
             };
 
             devShells.default = pkgs.mkShell {
@@ -121,12 +140,18 @@
           checks =
             let
               pkgs = import nixpkgs { system = "x86_64-linux"; };
+              lib = pkgs.lib;
             in
-            pkgs.lib.recursiveUpdate (pkgs.lib.attrsets.unionOfDisjoint { } self.packages) {
+            lib.recursiveUpdate (lib.attrsets.unionOfDisjoint { } self.packages) {
               x86_64-linux = {
                 spacebar-server-tests = self.packages.x86_64-linux.default.passthru.tests;
-                docker-image = self.containers.x86_64-linux.docker;
-              };
+              }
+              // (lib.listToAttrs (
+                lib.mapAttrsToList (name: container: {
+                  name = "docker-${name}";
+                  value = container;
+                }) self.containers.x86_64-linux.docker
+              ));
             };
         }
       )