Merge pull request sous-chefs#279 from jperville/container_memory_wit…

…h_unit Allow docker_container memory to have String value (eg. memory='1G').
dlackty · Mar 18, 2015 · e2fac3d · e2fac3d
2 parents 3ed149b + 6601b8e
commit e2fac3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -517,7 +517,7 @@ 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
+memory | Set memory limit for container | Fixnum, String | nil
 net | [Configure networking](http://docs.docker.io/reference/run/#network-settings) for container | String | nil
 networking (*DEPRECATED*) | Configure networking for container | TrueClass, FalseClass | true
 opt | Custom driver options | String, Array | nil

diff --git a/resources/container.rb b/resources/container.rb
@@ -32,7 +32,7 @@
 attribute :link, :kind_of => [String, Array]
 attribute :label, :kind_of => [String]
 attribute :lxc_conf, :kind_of => [String, Array]
-attribute :memory, :kind_of => [Fixnum]
+attribute :memory, :kind_of => [Fixnum, String]
 attribute :message, :kind_of => [String]
 attribute :net, :kind_of => [String], :regex => [
   /(host|bridge|none)/, /container:.*/