Merge pull request #1422 from chitter99/main

Allways creating home directory even if nothing in `copyToRoot`
cachix · Sep 9, 2024 · b92345f · b92345f
2 parents ca84a71 + 894686c
commit b92345f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/modules/containers.nix b/src/modules/containers.nix
@@ -40,8 +40,11 @@ let
   gid = "1000";
   homeDir = "/env";
 
-  mkHome = path: (pkgs.runCommand "devenv-container-home" { } ''
+  mkEnsureHomeExists = pkgs.runCommand "devenv-ensure-home" { } ''
     mkdir -p $out${homeDir}
+  '';
+
+  mkHome = path: (pkgs.runCommand "devenv-container-home" { } ''
     cp -R ${path}/. $out${homeDir}/
   '');
 
@@ -91,7 +94,6 @@ let
       gname = group;
     };
 
-
   mkDerivation = cfg: nix2container.nix2container.buildImage {
     name = cfg.name;
     tag = cfg.version;
@@ -112,6 +114,7 @@ let
       })
       mkEtc
       mkTmp
+      mkEnsureHomeExists
     ];
 
     maxLayers = cfg.maxLayers;
@@ -140,6 +143,7 @@ let
         uname = "root";
         gname = "root";
       }
+      (mkPerm mkEnsureHomeExists)
     ];
 
     config = {