fix(docker): set up docker networks at proper stage

deedee-ops · Nov 4, 2024 · e7d266e · e7d266e
1 parent 7e075f1
commit e7d266e
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/modules/system/apps/docker/default.nix b/modules/system/apps/docker/default.nix
@@ -143,20 +143,14 @@ in
     users.users."${config.mySystem.primaryUser}".extraGroups = [ "docker" ];
     networking.firewall.interfaces."docker0".allowedUDPPorts = [ 53 ];
 
-    systemd.services.docker-network-prepare =
+    systemd.services.docker.postStart =
       let
         dockerBin = lib.getExe pkgs."${config.virtualisation.oci-containers.backend}";
       in
-      {
-        script = ''
-          ${dockerBin} network inspect ${cfg.network.private.name} >/dev/null 2>&1 || ${dockerBin} network create ${cfg.network.private.name} --subnet ${cfg.network.private.subnet} --internal
-          ${dockerBin} network inspect ${cfg.network.public.name} >/dev/null 2>&1 || ${dockerBin} network create ${cfg.network.public.name} --subnet ${cfg.network.public.subnet}
-        '';
-        serviceConfig = {
-          Type = "oneshot";
-          User = "root";
-        };
-      };
+      lib.mkAfter ''
+        ${dockerBin} network inspect ${cfg.network.private.name} >/dev/null 2>&1 || ${dockerBin} network create ${cfg.network.private.name} --subnet ${cfg.network.private.subnet} --internal
+        ${dockerBin} network inspect ${cfg.network.public.name} >/dev/null 2>&1 || ${dockerBin} network create ${cfg.network.public.name} --subnet ${cfg.network.public.subnet}
+      '';
 
     environment.persistence."${config.mySystem.impermanence.persistPath}" =
       lib.mkIf config.mySystem.impermanence.enable