optimize(docker): get plantBreedGame in its own layer

timflutre · Dec 6, 2024 · ae4373b · ae4373b
1 parent fbfbc19
commit ae4373b
Showing 1 changed file with 45 additions and 31 deletions.
diff --git a/nix_package/image.nix b/nix_package/image.nix
@@ -1,17 +1,17 @@
+{ nix2containerPkgs, pkgs }:
 {
-  nix2containerPkgs,
-  pkgs,
-}: {
-  builder = {
-    imageName ? null,
-    plantBreedGame ? null,
-    tag ? "latest",
-  }: let
-    setTimezone = pkgs.runCommand "setTimezone" {} ''
-      mkdir -p $out/etc
-      ln -s ${pkgs.tzdata}/share/zoneinfo/Asia/Tokyo $out/etc/localtime
-    '';
-  in
+  builder =
+    {
+      imageName ? null,
+      plantBreedGame ? null,
+      tag ? "latest",
+    }:
+    let
+      setTimezone = pkgs.runCommand "setTimezone" { } ''
+        mkdir -p $out/etc
+        ln -s ${pkgs.tzdata}/share/zoneinfo/Asia/Tokyo $out/etc/localtime
+      '';
+    in
     nix2containerPkgs.nix2container.buildImage {
       name = imageName;
       tag = tag;
@@ -24,38 +24,52 @@
           deps = plantBreedGame.buildInput;
           maxLayers = 90;
         })
-        # plantBreedGame layer
-        (nix2containerPkgs.nix2container.buildLayer {
-          deps = plantBreedGame.buildInput;
-        })
       ];
 
       copyToRoot = [
         (pkgs.buildEnv {
           name = "root";
-          paths = with pkgs;
-          with pkgs.dockerTools; [
-            plantBreedGame
-            setTimezone
+          paths =
+            with pkgs;
+            with pkgs.dockerTools;
+            [
+              plantBreedGame
+              setTimezone
 
-            fakeNss
-            tzdata
+              fakeNss
+              tzdata
 
-            bashInteractive
-            coreutils
-            usrBinEnv
-            binSh
-          ];
+              bashInteractive
+              coreutils
+              usrBinEnv
+              binSh
+            ];
           ignoreCollisions = false;
-          pathsToLink = ["/bin" "/var" "/run" "/tmp" "/etc" "/share"];
+          pathsToLink = [
+            "/bin"
+            "/var"
+            "/run"
+            "/tmp"
+            "/etc"
+            "/share"
+          ];
         })
       ];
 
       config = {
         WorkingDir = "/";
-        Run = ["touch" "/toto.txt"];
+        Run = [
+          "touch"
+          "/toto.txt"
+        ];
         Volume = "/var/lib/plantBreedGame";
-        Cmd = ["${plantBreedGame}/bin/plantBreedGame" "--host" "0.0.0.0" "--port" "3838"];
+        Cmd = [
+          "${plantBreedGame}/bin/plantBreedGame"
+          "--host"
+          "0.0.0.0"
+          "--port"
+          "3838"
+        ];
         Expose = 3838;
       };
     };