home

commit 17511b9c373ea7ca4e465cda83265845baa6c88c
parent 9f4b2617f65b9eb5cdcb7d8bf2dbec0c2a768af1
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Thu,  8 Apr 2021 16:20:15 +0200

systems: re-enable containerd with a different name…

Goal is for it to work with unstable and stable. This will have to be
fully removed once stable includes the containerd module.

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

Diffstat:
M
systems/hosts/naruhodo.nix
 | 
4
++--
M
systems/modules/profiles/docker.nix
 | 
4
++--
M
systems/modules/virtualisation/containerd.nix
 | 
4
++--
M
systems/modules/virtualisation/default.nix
 | 
3
++-

4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/systems/hosts/naruhodo.nix b/systems/hosts/naruhodo.nix
@@ -146,8 +146,8 @@ in
   };
   systemd.services.buildkitd.wantedBy = lib.mkForce [ ];
   systemd.services.containerd.wantedBy = lib.mkForce [ ];
-  # systemd.services.docker.wantedBy = lib.mkForce [ ];
-  # systemd.services.docker.requires = [ "containerd.socket" ];
+  systemd.services.docker.wantedBy = lib.mkForce [ ];
+  systemd.services.docker.requires = [ "containerd.socket" ];
 
   virtualisation.podman.enable = true;
   virtualisation.containers = {
diff --git a/systems/modules/profiles/docker.nix b/systems/modules/profiles/docker.nix
@@ -22,9 +22,9 @@ in
   };
   config = mkIf cfg.enable {
     virtualisation = {
-      containerd = {
+      mycontainerd = {
         enable = true;
-        #autostart = false;
+        # autostart = false;
       };
       buildkitd = {
         enable = true;
diff --git a/systems/modules/virtualisation/containerd.nix b/systems/modules/virtualisation/containerd.nix
@@ -1,11 +1,11 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.virtualisation.containerd;
+  cfg = config.virtualisation.mycontainerd;
 
   inherit (lib) mkOption types mkIf;
 in
 {
-  options.virtualisation.containerd = {
+  options.virtualisation.mycontainerd = {
     enable = mkOption {
       type = types.bool;
       default = false;
diff --git a/systems/modules/virtualisation/default.nix b/systems/modules/virtualisation/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./buildkit.nix
     # Containerd is now a module upstream
-    # ./containerd.nix
+    # FIXME: remove this when 21.05 is out.
+    ./containerd.nix
   ];
 }