Skip to content

Commit

Permalink
Remove explicit false defaults in resources, fixes #133
Browse files Browse the repository at this point in the history
  • Loading branch information
bflad committed Apr 13, 2014
1 parent 0c746fb commit 03e7d54
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Attributes now available for all docker daemon flags as well as system IP forwar
* REMOVED: container_dns* attributes (use replacement dns* attributes on daemon for all containers or docker_container dns* attributes instead)
* DEPRECATED: bind_* attributes to match docker terminology (use host attribute instead)
* Bugfix: [#132][]: Do Not Explicitly Set storage_driver Attribute
* Bugfix: [#133][]: Remove explicit false defaults in resources
* Enhancement: [#115][]: Add IP forwarding attributes
* Enhancement: [#116][]: Docker 0.10.0: Add --no-prune to docker rmi
* Enhancement: [#117][]: Docker 0.10.0: Add --output flag to docker save (as well as tag support)
Expand Down Expand Up @@ -464,5 +465,6 @@ Lots of community contributions this release -- thanks!
[#127]: https://github.com/bflad/chef-docker/issues/127
[#128]: https://github.com/bflad/chef-docker/issues/128
[#132]: https://github.com/bflad/chef-docker/issues/132
[#133]: https://github.com/bflad/chef-docker/issues/133
[@jcrobak]: https://github.com/jcrobak
[@wingrunr21]: https://github.com/wingrunr21
6 changes: 3 additions & 3 deletions resources/container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
attribute :env, :kind_of => [String, Array]
attribute :env_file, :kind_of => [String]
attribute :expose, :kind_of => [Fixnum, String, Array]
attribute :force, :kind_of => [TrueClass, FalseClass], :default => false
attribute :force, :kind_of => [TrueClass, FalseClass]
attribute :hostname, :kind_of => [String]
attribute :id, :kind_of => [String]
attribute :init_type, :kind_of => [FalseClass, String], :default => node['docker']['container_init_type']
Expand All @@ -38,8 +38,8 @@
attribute :privileged, :kind_of => [TrueClass, FalseClass]
# public_port attribute is DEPRECATED
attribute :public_port, :kind_of => [Fixnum]
attribute :publish_exposed_ports, :kind_of => [TrueClass, FalseClass], :default => false
attribute :remove_automatically, :kind_of => [TrueClass, FalseClass], :default => false
attribute :publish_exposed_ports, :kind_of => [TrueClass, FalseClass]
attribute :remove_automatically, :kind_of => [TrueClass, FalseClass]
attribute :repository, :kind_of => [String]
attribute :run, :kind_of => [String]
attribute :signal, :kind_of => [String]
Expand Down
6 changes: 3 additions & 3 deletions resources/image.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
attribute :destination, :kind_of => [String]
# DEPRECATED: Use source attribute
attribute :dockerfile, :kind_of => [String]
attribute :force, :kind_of => [TrueClass, FalseClass], :default => false
attribute :force, :kind_of => [TrueClass, FalseClass]
attribute :id, :kind_of => [String]
# DEPRECATED: Use source attribute
attribute :image_url, :kind_of => [String]
attribute :input, :kind_of => [String]
attribute :no_cache, :kind_of => [TrueClass, FalseClass], :default => false
attribute :no_cache, :kind_of => [TrueClass, FalseClass]
attribute :no_prune, :kind_of => [TrueClass, FalseClass]
attribute :output, :kind_of => [String]
# DEPRECATED: Use source attribute
attribute :path, :kind_of => [String]
attribute :registry, :kind_of => [String]
attribute :repository, :kind_of => [String]
attribute :rm, :kind_of => [TrueClass, FalseClass], :default => true
attribute :rm, :kind_of => [TrueClass, FalseClass]
attribute :source, :kind_of => [String]
attribute :tag, :kind_of => [String]
attribute :virtual_size, :kind_of => [String]

0 comments on commit 03e7d54

Please sign in to comment.