Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging

2021-04-12 18:49:01 +00:00
parent 82ca81cd62 60daed5714
commit 08b22e605b
377 changed files with 13801 additions and 5789 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 = {