From 03e7d54d45ab7af143ff848f474197bed9f868a0 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Sun, 13 Apr 2014 00:23:27 -0400 Subject: [PATCH] Remove explicit false defaults in resources, fixes #133 --- CHANGELOG.md | 2 ++ resources/container.rb | 6 +++--- resources/image.rb | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42aea59bc6..eb29402794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) @@ -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 diff --git a/resources/container.rb b/resources/container.rb index d2e22bb865..3f00f334dd 100644 --- a/resources/container.rb +++ b/resources/container.rb @@ -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'] @@ -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] diff --git a/resources/image.rb b/resources/image.rb index ee46223623..704d7895ff 100644 --- a/resources/image.rb +++ b/resources/image.rb @@ -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]