kitchen-docker_cli 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8dceb30441238af20e54085bd05246412ab6998
-  data.tar.gz: ae5298feb43f10dc1cc88f93d261eba51c21abee
+  metadata.gz: 4cf7d32aaf8c8c0a88609685e0f7a0796c5f1dd4
+  data.tar.gz: 90bd2649a796053fd6f7a652849720134a73c785
 SHA512:
-  metadata.gz: 0ac22c3ec44a358a8df46775fb2e333a31a3f9ef31b25eeaade96d3516ad2e4bcef3ea4ee742df8bd4c51152642e23fa95ca99fa9ef97726501365874b2c1df3
-  data.tar.gz: 6a0300dd26598046315f2cf8b68d9c26de76d26ae29892b4fb7804d0d86e5ec3556b3cf139cea0ee055fe0560e8ed714317d4d8576057653d525c2a3a7ef6421
+  metadata.gz: 4eb36eefabfac676adef52433aa4d944d41e8e81b772463f28a28d31898eda7a86415ebb9dd4659083ca8aab56d56456c3d64b49f697130b18243fd4b409277c
+  data.tar.gz: 0a066b16e595bb25bb68ba5729f306033d3305b3b4a60d75b820cd1fa81e0cabdd715e42f69a9566c1262561d314a496d2802067dcf833aa11b948eea239ca6c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.18.0
+
+* Pull request [#33][]: Strengthen destroy ([@s-bernard][])
+* Pull request [#33][]: Add `destroy_container_name` option ([@s-bernard][])
+
 ## 0.17.0
 
 * Pull request [#32][]: Add ability to configure security options ([@fphilippon][])

data/README.md

@@ -200,6 +200,21 @@ Examples:
   instance_container_name: true
 ```
 
+
+### destroy_container_name
+
+Improve destroy action when containers have defined names.
+
+When enabled, "kitchen destroy" will always try to remove suite containers with their name (if defined by container_name or instance_container_name options) in addition to with the id defined in the current state. This allows a clean removal of containers even if the state is corrupted or was removed.
+
+The default value is `true`.
+
+Examples:
+
+```yml
+  destroy_container_name: false
+```
+
 ### network
 
 Set the Network mode for the container.  

data/lib/kitchen/driver/docker_cli.rb

@@ -37,6 +37,7 @@ module Kitchen
       default_config :transport, "docker_cli"
       default_config :dockerfile_vars, {}
       default_config :skip_preparation, false
+      default_config :destroy_container_name, true
 
       default_config :image do |driver|
         driver.default_image
@@ -66,7 +67,14 @@ module Kitchen
       def destroy(state)
         instance.transport.connection(state) do |conn|
           begin
-            conn.run_docker("rm -f #{state[:container_id]}") if state[:container_id]
+            if state[:container_id]
+              output = conn.run_docker("ps -a -q -f id=#{state[:container_id]}").chomp
+              conn.run_docker("rm -f #{state[:container_id]}") unless output.empty?
+            end
+            if config[:destroy_container_name] && container_name
+              output = conn.run_docker("ps -a -q -f name=#{container_name}").chomp
+              conn.run_docker("rm -f #{container_name}") unless output.empty?
+            end
           rescue => e
             raise e unless conn.send(:options)[:lxc_driver]
           end
@@ -101,11 +109,7 @@ module Kitchen
 
       def docker_run_command(image)
         cmd = String.new("run -d -t")
-        if config[:container_name]
-          cmd << " --name #{config[:container_name]}"
-        elsif config[:instance_container_name]
-          cmd << " --name #{instance.name}"
-        end
+        cmd << " --name #{container_name}" if container_name
         cmd << ' -P' if config[:publish_all]
         cmd << " -m #{config[:memory_limit]}" if config[:memory_limit]
         cmd << " -c #{config[:cpu_shares]}" if config[:cpu_shares]
@@ -127,6 +131,14 @@ module Kitchen
         cmd << " #{image} #{config[:command]}"
       end
 
+      def container_name
+        if config[:container_name]
+          config[:container_name]
+        elsif config[:instance_container_name]
+          instance.name
+        end
+      end
+
       def parse_image_id(output)
         unless output.chomp.match(/Successfully built ([0-9a-z]{12})$/)
           raise ActionFailed, 'Could not parse IMAGE ID.'

data/lib/kitchen/driver/docker_cli_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for DockerCli Kitchen driver
-    DOCKER_CLI_VERSION = '0.17.0'
+    DOCKER_CLI_VERSION = '0.18.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen