home

commit ae579d7c645ee7e4e2facb3c39c1a14d2a58a848
parent 9760cc9787c100e1ddceaf4e4da3f4bd42d9f443
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Thu, 17 Feb 2022 15:23:22 +0100

systems/modules: re-enable buildkitd

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/modules/profiles/docker.nix
 | 
10
+++++-----
M
systems/modules/virtualisation/buildkit.nix
 | 
13
++-----------

2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/systems/modules/profiles/docker.nix b/systems/modules/profiles/docker.nix
@@ -26,11 +26,11 @@ in
         enable = true;
         # autostart = false;
       };
-      # buildkitd = {
-      #   enable = true;
-      #   autostart = false;
-      #   extraOptions = "--oci-worker=false --containerd-worker=true";
-      # };
+      buildkitd = {
+        enable = true;
+        extraOptions = "--oci-worker=false --containerd-worker=true";
+        # autostart = false;
+      };
       docker = {
         enable = true;
         package = cfg.package;
diff --git a/systems/modules/virtualisation/buildkit.nix b/systems/modules/virtualisation/buildkit.nix
@@ -14,14 +14,6 @@ in
         '';
     };
 
-    autostart = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Start buildkitd automatically.
-      '';
-    };
-
     package = mkOption {
       default = pkgs.buildkit;
       type = types.package;
@@ -54,9 +46,8 @@ in
     systemd.packages = [ cfg.package ];
 
     systemd.services.buildkitd = {
-      wants = [ "containerd.service" ];
-      after = [ "containerd.service" ];
-      wantedBy = lib.optional cfg.autostart [ "multi-user.target" ];
+      after = [ "network.target" "containerd.service" ];
+      wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = [
           ""