Merge #156

providers/container.rb

@@ -4,9 +4,7 @@ def load_current_resource
   @current_resource = Chef::Resource::DockerContainer.new(new_resource)
   wait_until_ready!
   docker_containers.each do |ps|
-    next unless container_image_matches?(ps['image'])
-    next unless container_command_matches_if_exists?(ps['command'])
-    next unless container_name_matches_if_exists?(ps['names'])
+    next unless container_matches?(ps)
     Chef::Log.debug('Matched docker container: ' + ps['line'].squeeze(' '))
     @current_resource.container_name(ps['names'])
     @current_resource.created(ps['created'])
@@ -132,6 +130,15 @@ def commit
   docker_cmd!("commit #{commit_args} #{current_resource.id} #{commit_end_args}")
 end
 
+def container_matches?(ps)
+  return true if container_id_matches?(ps['id'])
+  return true if container_name_matches?(ps['names'])
+  return false unless container_image_matches?(ps['image'])
+  return false unless container_command_matches_if_exists?(ps['command'])
+  return false unless container_name_matches_if_exists?(ps['names'])
+  true
+end
+
 def container_command_matches_if_exists?(command)
   return true if new_resource.command.nil?
   # try the exact command but also the command with the ' and " stripped out, since docker will
@@ -148,6 +155,10 @@ def container_image_matches?(image)
   image.include?(new_resource.image)
 end
 
+def container_name_matches?(names)
+  new_resource.container_name && new_resource.container_name == names
+end
+
 def container_name_matches_if_exists?(names)
   return false if new_resource.container_name && new_resource.container_name != names
   true

test/cookbooks/docker_test/files/default/tests/minitest/container_lwrp_test.rb

@@ -38,4 +38,9 @@
     assert container_running?('bflad/testcontainerd')
     service('testcontainerd').must_be_running
   end
+
+  it "has a named busybox-container running sleep 8888" do
+    cmd = container_info("busybox-container").first['Config']['Cmd']
+    assert cmd.grep(/8888/).count > 0
+  end
 end

test/cookbooks/docker_test/files/default/tests/minitest/support/helpers.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Helpers
   module DockerTest
     require 'chef/mixin/shell_out'
@@ -29,5 +31,9 @@ def image_exists?(image)
       di.stdout.include?(image)
     end
 
+    def container_info(name)
+      JSON.parse(shell_out("docker inspect #{name}").stdout)
+    end
+
   end
 end

test/cookbooks/docker_test/recipes/container_lwrp.rb

@@ -76,3 +76,19 @@
   detach true
   port '9999:9999'
 end
+
+docker_container "busybox-container" do
+  image "busybox"
+  container_name "busybox-container"
+  command "sleep 7777"
+  detach true
+  init_type false
+end
+
+docker_container "busybox-container" do
+  image "busybox"
+  container_name "busybox-container"
+  command "sleep 8888"
+  init_type false
+  action :redeploy
+end