fix(flake): separate base from source-containing layers

Signed-off-by: Cameron Smith <cameron.ray.smith@gmail.com>
pinellolab · Jul 1, 2024 · cca450e · cca450e
1 parent b11fea5
commit cca450e
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/flake.nix b/flake.nix
@@ -141,7 +141,7 @@
             '';
           };
 
-        containerImageConfigs = import ./nix/containers {
+        containerImages = import ./nix/containers {
           inherit
             pkgs
             mkPoetryEnvWithSource
@@ -208,13 +208,11 @@
             paths = with pkgs; [poetry python310];
           };
 
-          containerImage =
-            pkgs.dockerTools.buildLayeredImage
-            containerImageConfigs.containerImageConfig;
+          baseContainerImage = containerImages.baseContainerImage;
+          containerImage = containerImages.containerImage;
 
-          devcontainerImage =
-            pkgs.dockerTools.buildLayeredImage
-            containerImageConfigs.devcontainerImageConfig;
+          baseDevContainerImage = containerImages.baseDevContainerImage;
+          devcontainerImage = containerImages.devcontainerImage;
 
           codeImage = import ./nix/containers/code.nix {
             inherit pkgs devPackages buildMultiUserNixImage;