Merge master into staging-next

2021-04-09 12:06:22 +00:00
parent 496c7d3e9d 9af991a1b1
commit c876eb99be
27 changed files with 502 additions and 333 deletions
@@ -157,6 +157,7 @@ in

      systemd.services.docker = {
        wantedBy = optional cfg.enableOnBoot "multi-user.target";
+        after = [ "network.target" "docker.socket" ];
        requires = [ "docker.socket" ];
        environment = proxy_env;
        serviceConfig = {