Build Docker images directly with Nix

kitsune-soc · Nov 11, 2024 · 6a3c8cf · 6a3c8cf
1 parent fbf3c42
commit 6a3c8cf
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 107 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/flake.nix b/flake.nix
@@ -122,6 +122,30 @@
                 }
               );
 
+              cli-docker = pkgs.dockerTools.buildImage {
+                name = "kitsune-cli";
+                tag = "latest";
+                copyToRoot = [ cli ];
+                config.Cmd = [ "${cli}/bin/kitsune-cli" ];
+              };
+
+              job-runner = craneLib.buildPage (
+                commonArgs
+                // {
+                  pname = "kitsune-job-runner";
+                  cargoExtraArgs = commonArgs.cargoExtraArgs + " --bin kitsune-job-runner";
+                  inherit cargoArtifacts;
+                  doCheck = false;
+                }
+              );
+
+              job-runner-docker = pkgs.dockerTools.buildImage {
+                name = "kitsune-job-runner";
+                tag = "latest";
+                copyToRoot = [ job-runner ];
+                config.Cmd = [ "${job-runner}/bin/kitsune-job-runner" ];
+              };
+
               mrf-tool = craneLib.buildPackage (
                 commonArgs
                 // {
@@ -136,12 +160,19 @@
                 commonArgs
                 // {
                   pname = "kitsune";
-                  cargoExtraArgs = commonArgs.cargoExtraArgs + " --bin kitsune --bin kitsune-job-runner";
+                  cargoExtraArgs = commonArgs.cargoExtraArgs + " --bin kitsune";
                   inherit cargoArtifacts;
                   doCheck = false;
                 }
               );
 
+              main-docker = pkgs.dockerTools.buildImage {
+                name = "kitsune";
+                tag = "latest";
+                copyToRoot = [ main ];
+                config.Cmd = [ "${main}/bin/kitsune" ];
+              };
+
               frontend = pnpm2nix.packages.${system}.mkPnpmPackage {
                 src = "${src}/kitsune-fe";
                 distDir = "build";

diff --git a/kitsune/Dockerfile.dev b/kitsune/Dockerfile.dev
diff --git a/kitsune/Dockerfile.prod b/kitsune/Dockerfile.prod