Skip to content

Commit

Permalink
Add --label for docker run, closes #105
Browse files Browse the repository at this point in the history
  • Loading branch information
bflad committed Mar 31, 2014
1 parent 4ff8662 commit 9f924aa
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ This release deprecates AUFS/device-mapper handling from chef-docker, but provid
* Enhancement: [#88][]: Migrate AUFS logic to separate cookbook
* Enhancement: [#90][]: Migrate device-mapper logic to separate cookbook
* Enhancement: [#110][]: Add docker Upstart pre-start script and limits configuration
* Enhancement: [#105][]: Add --label for docker run
* Enhancement: [#108][]: Add --dns-search for docker run
* Enhancement: [#104][]: Add TMPDIR
* Enhancement: container_dns* attributes to set --dns and --dns-search for all containers
Expand Down Expand Up @@ -413,6 +414,7 @@ Lots of community contributions this release -- thanks!
[#101]: https://github.com/bflad/chef-docker/issues/101
[#103]: https://github.com/bflad/chef-docker/issues/103
[#104]: https://github.com/bflad/chef-docker/issues/104
[#105]: https://github.com/bflad/chef-docker/issues/105
[#108]: https://github.com/bflad/chef-docker/issues/108
[#109]: https://github.com/bflad/chef-docker/issues/109
[#110]: https://github.com/bflad/chef-docker/issues/110
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ image | Image for container | String | LWRP name
init_type | Init type for container service handling | FalseClass, String | `node['docker']['container_init_type']`
init_template | Template to use for init configuration | String | nil
link | Add link to another container | String, Array | nil
label | Options to pass to underlying labeling system | String | nil
lxc_conf | Custom LXC options | String, Array | nil
memory | Set memory limit for container | Fixnum | nil
port | Map network port(s) to the container | Fixnum (*DEPRECATED*), String, Array | nil
Expand Down
1 change: 1 addition & 0 deletions providers/container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ def run
'expose' => Array(new_resource.expose),
'hostname' => new_resource.hostname,
'interactive' => new_resource.stdin,
'label' => new_resource.label,
'link' => Array(new_resource.link),
'lxc-conf' => Array(new_resource.lxc_conf),
'memory' => new_resource.memory,
Expand Down
1 change: 1 addition & 0 deletions resources/container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
attribute :init_type, :kind_of => [FalseClass, String], :default => node['docker']['container_init_type']
attribute :init_template, :kind_of => [String]
attribute :link, :kind_of => [String, Array]
attribute :label, :kind_of => [String]
attribute :lxc_conf, :kind_of => [String, Array]
attribute :memory, :kind_of => [Fixnum]
attribute :message, :kind_of => [String]
Expand Down

0 comments on commit 9f924aa

Please sign in to comment.