Merge pull request #296 from bflad/systemd-upstream-changes

Default systemd to fd:// as well as use upstream MountFlags=slave and LimitCORE=infinity
sous-chefs · Apr 14, 2015 · 3ed08c0 · 3ed08c0
2 parents 4c4dad8 + 53ade42
commit 3ed08c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -149,6 +149,8 @@
 default['docker']['host'] =
   if node['docker']['bind_socket'] || node['docker']['bind_uri']
     Array(node['docker']['bind_socket']) + Array(node['docker']['bind_uri'])
+  elsif node['docker']['init_type'] == 'systemd'
+    'fd://'
   else
     'unix:///var/run/docker.sock'
   end

diff --git a/templates/default/docker.service.erb b/templates/default/docker.service.erb
@@ -25,8 +25,10 @@ ExecStartPre=/usr/sbin/sysctl -w net.ipv4.ip_forward=1
 ExecStartPre=/usr/sbin/sysctl -w net.ipv6.conf.all.forwarding=1
 <% end -%>
 ExecStart=<%= Docker::Helpers.executable(node) %> -d<%= @daemon_options %>
+MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576
+LimitCORE=infinity
 
 [Install]
 WantedBy=multi-user.target