Merge pull request #104094 from flokli/systemd-unified-cgroup-hierarchy

systemd: switch to unified cgroup hierarchy by default
2020-11-22 22:35:42 +01:00
parent a62e6738af 90d5bdb12f
commit c76891314d
8 changed files with 78 additions and 23 deletions
@@ -155,6 +155,9 @@ in
      users.groups.docker.gid = config.ids.gids.docker;
      systemd.packages = [ cfg.package ];

+      # TODO: remove once docker 20.10 is released
+      systemd.enableUnifiedCgroupHierarchy = false;
+
      systemd.services.docker = {
        wantedBy = optional cfg.enableOnBoot "multi-user.target";
        environment = proxy_env;