Skip to content

Commit

Permalink
Add --networking for docker run, closes #107
Browse files Browse the repository at this point in the history
  • Loading branch information
bflad committed Mar 31, 2014
1 parent 9f924aa commit 59c139f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -28,6 +28,7 @@ This release deprecates AUFS/device-mapper handling from chef-docker, but provid
* 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: [#107][]: Add --networking 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 @@ -415,6 +416,7 @@ Lots of community contributions this release -- thanks!
[#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
[#107]: https://github.com/bflad/chef-docker/issues/107
[#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
Expand Up @@ -378,6 +378,7 @@ 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
networking | Configure networking for container | TrueClass, FalseClass | true
port | Map network port(s) to the container | Fixnum (*DEPRECATED*), String, Array | nil
privileged | Give extended privileges | TrueClass, FalseClass | nil
public_port (*DEPRECATED*) | Map host port to container | Fixnum | nil
Expand Down
1 change: 1 addition & 0 deletions providers/container.rb
Expand Up @@ -288,6 +288,7 @@ def run
'link' => Array(new_resource.link),
'lxc-conf' => Array(new_resource.lxc_conf),
'memory' => new_resource.memory,
'networking' => new_resource.networking,
'name' => container_name,
'publish' => Array(port),
'publish-all' => new_resource.publish_exposed_ports,
Expand Down
1 change: 1 addition & 0 deletions resources/container.rb
Expand Up @@ -30,6 +30,7 @@
attribute :lxc_conf, :kind_of => [String, Array]
attribute :memory, :kind_of => [Fixnum]
attribute :message, :kind_of => [String]
attribute :networking, :kind_of => [TrueClass, FalseClass]
# Fixnum kind_of port attribute is DEPRECATED
attribute :port, :kind_of => [Fixnum, String, Array]
attribute :privileged, :kind_of => [TrueClass, FalseClass]
Expand Down

0 comments on commit 59c139f

Please sign in to comment.