From 514523e4f0f25fd27d5c89e145e4f878d551e2d3 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Sat, 24 Aug 2024 20:25:09 +0300 Subject: [PATCH] Docker : Disable autostart by default. --- module/Docker.nix | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/module/Docker.nix b/module/Docker.nix index b0447c2..327496a 100644 --- a/module/Docker.nix +++ b/module/Docker.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: with lib; let +{ lib, config, ... }: with lib; let cfg = config.module.docker; in { options = { @@ -15,27 +15,24 @@ in { }; }; - config = mkIf cfg.enable { - virtualisation.docker.enable = true; + config = mkIf cfg.enable (mkMerge [ + { + virtualisation.docker.enable = true; - virtualisation.docker.rootless = mkIf cfg.rootless { - enable = true; - setSocketVariable = true; - }; + systemd = { + services = { + docker-prune.enable = mkForce cfg.autostart; + docker.enable = mkForce cfg.autostart; + }; + sockets.docker.enable = mkForce cfg.autostart; + }; + } - systemd.services.docker-prune.enable = mkForce cfg.autostart; - systemd.services.docker.enable = mkForce cfg.autostart; - systemd.sockets.docker.enable = mkForce cfg.autostart; - }; - - # NOTE: mkMerge example. - # config = mkIf cfg.enable (mkMerge [ - # { virtualisation.docker.enable = true; } - # (mkIf cfg.rootless { - # virtualisation.docker.rootless = { - # enable = true; - # setSocketVariable = true; - # }; - # }) - # ]); + (mkIf cfg.rootless { + virtualisation.docker.rootless = { + enable = true; + setSocketVariable = true; + }; + }) + ]); }