summary refs log tree commit diff
path: root/nixos/modules/virtualisation/docker.nix
diff options
context:
space:
mode:
authorLuca Bruno <lucabru@src.gnome.org>2015-11-20 23:01:33 +0100
committerLuca Bruno <lucabru@src.gnome.org>2015-11-20 23:01:59 +0100
commita6c42b59459ad08a76fa13fc4019f93ae8d75335 (patch)
tree2b4441ed81a112683e4b852b634c0616c3f83ce5 /nixos/modules/virtualisation/docker.nix
parent4e61fc89d261eb4815186b451e43a5925a4eb2a1 (diff)
downloadnixlib-a6c42b59459ad08a76fa13fc4019f93ae8d75335.tar
nixlib-a6c42b59459ad08a76fa13fc4019f93ae8d75335.tar.gz
nixlib-a6c42b59459ad08a76fa13fc4019f93ae8d75335.tar.bz2
nixlib-a6c42b59459ad08a76fa13fc4019f93ae8d75335.tar.lz
nixlib-a6c42b59459ad08a76fa13fc4019f93ae8d75335.tar.xz
nixlib-a6c42b59459ad08a76fa13fc4019f93ae8d75335.tar.zst
nixlib-a6c42b59459ad08a76fa13fc4019f93ae8d75335.zip
nixos/docker: enable socketActivation by default
Diffstat (limited to 'nixos/modules/virtualisation/docker.nix')
-rw-r--r--nixos/modules/virtualisation/docker.nix7
1 files changed, 1 insertions, 6 deletions
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 0c642bf3b816..718ca0851477 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -31,16 +31,11 @@ in
     socketActivation =
       mkOption {
         type = types.bool;
-        default = false;
+        default = true;
         description =
           ''
             This option enables docker with socket activation. I.e. docker will
             start when first called by client.
-
-            Note: This is false by default because systemd lower than 214 that
-            nixos uses so far, doesn't support SocketGroup option, so socket
-            created by docker has root group now. This will likely be changed
-            in future.  So set this option explicitly to false if you wish.
           '';
       };
     storageDriver =