Skip to content

Commit

Permalink
Add group_members attribute and group recipe, closes #63
Browse files Browse the repository at this point in the history
  • Loading branch information
bflad committed Feb 8, 2014
1 parent cdb290b commit a6a84ca
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ bind_uri | TCP URI docker should bind | String | nil
container_cmd_timeout | container LWRP default cmd_timeout seconds | Fixnum | 60
container_init_type | Init type for docker containers (nil, "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
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
init_type | Init type for docker ("systemd", "sysv", or "upstart") | String | auto-detected (see attributes/default.rb)
Expand Down Expand Up @@ -97,6 +98,7 @@ url | Repository URL for docker source | String | "https://github.com/dotcloud/d
* `recipe[docker::binary]` Installs Docker binary
* `recipe[docker::cgroups]` Installs/configures default platform Control Groups support
* `recipe[docker::devmapper]` Installs/Configures Device Mapper
* `recipe[docker::group]` Installs/Configures docker group
* `recipe[docker::lxc]` Installs/configures default platform LXC support
* `recipe[docker::package]` Installs Docker via package
* `recipe[docker::source]` Installs Docker via source
Expand Down
1 change: 1 addition & 0 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
default['docker']['bind_uri'] = nil
default['docker']['container_cmd_timeout'] = 60
default['docker']['docker_daemon_timeout'] = 10
default['docker']['group_members'] = []
default['docker']['http_proxy'] = nil
default['docker']['image_cmd_timeout'] = 300
default['docker']['registry_cmd_timeout'] = 60
Expand Down
1 change: 1 addition & 0 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
recipe 'docker::binary', 'Installs Docker binary'
recipe 'docker::cgroups', 'Installs/configures default platform Control Groups support'
recipe 'docker::devmapper', 'Installs/Configures Device Mapper'
recipe 'docker::group', 'Installs/Configures docker group'
recipe 'docker::lxc', 'Installs/configures default platform LXC support'
recipe 'docker::package', 'Installs Docker via package'
recipe 'docker::source', 'Installs Docker via source'
Expand Down
1 change: 1 addition & 0 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@
end

include_recipe "docker::#{node['docker']['install_type']}"
include_recipe 'docker::group' unless node['docker']['group_members'].empty?
include_recipe "docker::#{node['docker']['init_type']}"
4 changes: 4 additions & 0 deletions recipes/group.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
group 'docker' do
members node['docker']['group_members']
action [:create, :manage]
end

0 comments on commit a6a84ca

Please sign in to comment.