Add a -G option to specify the group which unix sockets belong, closes …

…#81

CHANGELOG.md

@@ -16,6 +16,7 @@ This release includes Docker 0.9.0 changes and defaults, such as setting exec_dr
 * DEPRECATED: Rename virtualization_type attribute to exec_driver to [match Docker terminology](http://docs.docker.io/en/latest/reference/commandline/cli/#daemon) (virtualization_type will be removed in chef-docker 1.0)
 * Enhancement: [#77][]: Improved docker ps handling
 * Enhancement: [#78][]: Docker 0.9.0: Make --rm the default for docker build
+* Enhancement: [#81][]: Docker 0.9.0: Add a -G option to specify the group which unix sockets belong
 * Enhancement: [#82][]: Docker 0.9.0: Add -f flag to docker rm to force removal of running containers
 * Enhancement: Add -f flag for docker rmi to force removal of images
 * Enhancement: [#84][]: Docker 0.9.0: Add -e flag for execution driver
@@ -358,6 +359,8 @@ Lots of community contributions this release -- thanks!
 [#72]: https://github.com/bflad/chef-docker/issues/72
 [#77]: https://github.com/bflad/chef-docker/issues/77
 [#78]: https://github.com/bflad/chef-docker/issues/78
+[#81]: https://github.com/bflad/chef-docker/issues/81
+[#82]: https://github.com/bflad/chef-docker/issues/82
 [#84]: https://github.com/bflad/chef-docker/issues/84
 [#86]: https://github.com/bflad/chef-docker/issues/86
 [@jcrobak]: https://github.com/jcrobak

README.md

@@ -55,6 +55,7 @@ container_cmd_timeout | container LWRP default cmd_timeout seconds | Fixnum | 60
 container_init_type | Init type for docker containers (nil, "runit", "systemd", or "upstart") | NilClass or String | `node['docker']['init_type']`
 docker_daemon_timeout | Timeout to wait for the docker daemon to start in seconds | Fixnum | 10
 exec_driver | Execution driver for docker (nil or "lxc") | String | auto-detected (see attributes/default.rb)
+group | Group for docker socket and group_members | String | docker
 group_members | Manage docker group members | Array of Strings | []
 http_proxy | HTTP_PROXY environment variable | String | nil
 image_cmd_timeout | image LWRP default cmd_timeout seconds | Fixnum | 300

attributes/default.rb

@@ -17,6 +17,7 @@
 # DEPRECATED: will be removed in chef-docker 1.0
 default['docker']['virtualization_type'] = node['docker']['exec_driver']
 
+default['docker']['group'] = 'docker'
 default['docker']['group_members'] = []
 default['docker']['http_proxy'] = nil
 default['docker']['image_cmd_timeout'] = 300

recipes/group.rb

@@ -1,4 +1,4 @@
-group 'docker' do
+group node['docker']['group'] do
   members node['docker']['group_members']
   action [:create, :manage]
 end

templates/default/docker.service.erb

@@ -9,7 +9,7 @@ Type=simple
 Environment="HTTP_PROXY=<%= node['docker']['http_proxy'] %>"
 <% end -%>
 ExecStartPre=/usr/sbin/sysctl -w net.ipv4.ip_forward=1 net.ipv6.conf.all.forwarding=1
-ExecStart=<%= node['docker']['install_dir'] %>/docker -d<%= node['docker']['bind_socket'] ? " -H #{node['docker']['bind_socket']}" : '' %><%= node['docker']['bind_uri'] ? " -H #{node['docker']['bind_uri']}" : '' %><%= node['docker']['container_init_type'] ? ' -r=false' : '' %><%= node['docker']['options'] ? " #{node['docker']['options']}" : '' %><%= node['docker']['storage_driver'] ? " -s #{node['docker']['storage_driver']}" : '' %><%= node['docker']['exec_driver'] ? " -e #{node['docker']['exec_driver']}" : '' %>
+ExecStart=<%= node['docker']['install_dir'] %>/docker -d<%= node['docker']['bind_socket'] ? " -H #{node['docker']['bind_socket']}" : '' %><%= node['docker']['bind_uri'] ? " -H #{node['docker']['bind_uri']}" : '' %><%= node['docker']['container_init_type'] ? ' -r=false' : '' %><%= node['docker']['options'] ? " #{node['docker']['options']}" : '' %><%= node['docker']['storage_driver'] ? " -s #{node['docker']['storage_driver']}" : '' %><%= node['docker']['exec_driver'] ? " -e #{node['docker']['exec_driver']}" : '' %><%= node['docker']['group'] ? " -G #{node['docker']['group']}" : '' %>
 Restart=on-failure
 
 [Install]

templates/default/docker.sysconfig.erb

@@ -22,6 +22,9 @@ DOCKER_OPTS="$DOCKER_OPTS -s <%= node['docker']['storage_driver'] %>"
 <% if node['docker']['exec_driver'] -%>
 DOCKER_OPTS="$DOCKER_OPTS -e <%= node['docker']['exec_driver'] %>"
 <% end -%>
+<% if node['docker']['group'] -%>
+DOCKER_OPTS="$DOCKER_OPTS -G <%= node['docker']['group'] %>"
+<% end -%>
 
 # If you need Docker to use an HTTP proxy, it can also be specified here.
 <% if node['docker']['http_proxy'] -%>

templates/default/sv-docker-run.erb

@@ -3,4 +3,4 @@ exec 2>&1
 <% if node['docker']['http_proxy'] -%>
 export HTTP_PROXY=<%= node['docker']['http_proxy'] %>
 <% end -%>
-exec <%= node['docker']['install_dir'] %>/docker -d<%= node['docker']['bind_socket'] ? " -H #{node['docker']['bind_socket']}" : '' %><%= node['docker']['bind_uri'] ? " -H #{node['docker']['bind_uri']}" : '' %><%= node['docker']['container_init_type'] ? ' -r=false' : '' %><%= node['docker']['options'] ? " #{node['docker']['options']}" : '' %><%= node['docker']['storage_driver'] ? " -s #{node['docker']['storage_driver']}" : '' %><%= node['docker']['exec_driver'] ? " -e #{node['docker']['exec_driver']}" : '' %>
+exec <%= node['docker']['install_dir'] %>/docker -d<%= node['docker']['bind_socket'] ? " -H #{node['docker']['bind_socket']}" : '' %><%= node['docker']['bind_uri'] ? " -H #{node['docker']['bind_uri']}" : '' %><%= node['docker']['container_init_type'] ? ' -r=false' : '' %><%= node['docker']['options'] ? " #{node['docker']['options']}" : '' %><%= node['docker']['storage_driver'] ? " -s #{node['docker']['storage_driver']}" : '' %><%= node['docker']['exec_driver'] ? " -e #{node['docker']['exec_driver']}" : '' %><%= node['docker']['group'] ? " -G #{node['docker']['group']}" : '' %>