Add CHANGELOG entry for #156, add nil checks for container matching m…

…ethods

CHANGELOG.md

@@ -32,7 +32,7 @@ Major kudos to @tduffield for the [#147][] PR, which includes:
 Other awesome work merged:
 
 * [#142][]: Bugfix: Redeploy breaks when a link is present
-* [#139][]/[#153][]/[#154][]/[#157][]: Bugfix: container/image ID given as nil, fixes deprecated -notrunc
+* [#139][]/[#153][]/[#154][]/[#156][]/[#157][]: Bugfix: container/image ID given as nil, fixes deprecated -notrunc
 * [#164][]: Bugfix: Removing a container should also remove its cidfile
 * [#166][]: Bugfix: Fix docker_inspect_id for Docker 1.0+
 * [#158][]/[#160][]/[#165][]: Bugfix: Fix NameError when displaying error messages for timed-out commands
@@ -519,6 +519,7 @@ Lots of community contributions this release -- thanks!
 [#152]: https://github.com/bflad/chef-docker/issues/152
 [#153]: https://github.com/bflad/chef-docker/issues/153
 [#154]: https://github.com/bflad/chef-docker/issues/154
+[#156]: https://github.com/bflad/chef-docker/issues/156
 [#157]: https://github.com/bflad/chef-docker/issues/157
 [#158]: https://github.com/bflad/chef-docker/issues/158
 [#160]: https://github.com/bflad/chef-docker/issues/160

providers/container.rb

@@ -148,14 +148,17 @@ def container_command_matches_if_exists?(command)
 end
 
 def container_id_matches?(id)
+  return false unless id
   id.start_with?(new_resource.id)
 end
 
 def container_image_matches?(image)
+  return false unless image
   image.include?(new_resource.image)
 end
 
 def container_name_matches?(names)
+  return false unless names
   new_resource.container_name && new_resource.container_name == names
 end