home

commit e67728176dec2221873b2ecafffe42235a01c700
parent 0dc43116e5b525993574eae8c07652413b66b5e6
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue, 14 Sep 2021 14:18:56 +0200

systems/aomi: enable docker…

… and simplify docker profile:
- no buildkitd for now (I don't use it)
- no custom containerd setup

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

Diffstat:
M
systems/hosts/aomi.nix
 | 
1
+
M
systems/modules/profiles/docker.nix
 | 
12
++++++------

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/systems/hosts/aomi.nix b/systems/hosts/aomi.nix
@@ -102,6 +102,7 @@ in
     virtualization = { enable = true; nested = true; };
     redhat.enable = true;
     ssh.enable = true;
+    docker.enable = true;
   };
 
 
diff --git a/systems/modules/profiles/docker.nix b/systems/modules/profiles/docker.nix
@@ -22,15 +22,15 @@ in
   };
   config = mkIf cfg.enable {
     virtualisation = {
-      mycontainerd = {
+      containerd = {
         enable = true;
         # autostart = false;
       };
-      buildkitd = {
-        enable = true;
-        autostart = false;
-        extraOptions = "--oci-worker=false --containerd-worker=true";
-      };
+      # buildkitd = {
+      #   enable = true;
+      #   autostart = false;
+      #   extraOptions = "--oci-worker=false --containerd-worker=true";
+      # };
       docker = {
         enable = true;
         package = cfg.package;