kitchen-docker_cli 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6defa165a7c612346eaad601d37264298d86862d
-  data.tar.gz: b9a39bbdc29c976d04c25d8942de68f4648c0018
+  metadata.gz: 9d028d23a49fb2312efb4fa63ec1e7e3830d80c7
+  data.tar.gz: c47a6d396d48d043e970ae52c98b73dec27fd5e0
 SHA512:
-  metadata.gz: 87e392d0a452cee0e742e0541d4e2201160772a7870ccf516dbfc7d54fe451238776fa9f256a46c9b006289f22742e042be0cc021c0ad2d285e3f2350f890997
-  data.tar.gz: 8f7790ae15cbc31fba83d18f36f17e88e109e1bf2ab4e5162decc5d93b7feb095e03224a8723ee66c7e3dc7f6aeaf3035c1444b53e8c0285e460498b4cce26e6
+  metadata.gz: 2b932f1850b9c00dc0468d1756d5e3b3a834e0283ba9ee9dcdacc6f5ac1411159e0261e13d412fbbe74617c63ad0653db18faba03bf4acc182d7cf908856157e
+  data.tar.gz: 2bb0a5327f95d3ed40f40dcc97a49eb5cdd532fe3b4c74ac10527531cc2653597b39b2f72b5c85e3ed380b0b1e34c463953c71cfa57106e62d503131af79e3e4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.16.0
+
+* Pull request [#31][]: Add instance_container_name option ([@s-bernard][])
+
 ## 0.15.1
 
 * Pull request [#30][]: Fix [#29][]: use docker cp to upload files ([@s-bernard][])
@@ -8,7 +12,7 @@
 
 ## 0.14.2
 
-* Fix error on Circle-CI
+* Fix error on Circle CI
 
 ## 0.14.1
 
@@ -125,4 +129,4 @@
 [@nrvale0]: https://github.com/nrvale0
 [@s-bernard]: https://github.com/s-bernard
 [@sawanoboly]: https://github.com/sawanoboly
-[@yewton]: https://github.com/yewton
+[@yewton]: https://github.com/yewton

data/README.md

@@ -176,6 +176,18 @@ Examples:
   container_name: web
 ```
 
+### instance_container_name
+
+Use instance name to container_name.
+
+The default value is `false`.
+
+Examples:
+
+```yml
+  instance_container_name: true
+```
+
 ### network
 
 Set the Network mode for the container.  
@@ -201,6 +213,7 @@ Examples:
 ```
 
 ### instance_host_name
+
 Use instance name to hostname.
 
 The default value is `false`.

data/lib/kitchen/driver/docker_cli.rb

@@ -33,6 +33,7 @@ module Kitchen
       default_config :command, 'sh -c \'while true; do sleep 1d; done;\''
       default_config :privileged, false
       default_config :instance_host_name, false
+      default_config :instance_container_name, false
       default_config :transport, "docker_cli"
       default_config :dockerfile_vars, {}
       default_config :skip_preparation, false
@@ -100,7 +101,11 @@ module Kitchen
 
       def docker_run_command(image)
         cmd = String.new("run -d -t")
-        cmd << " --name #{config[:container_name]}" if config[:container_name]
+        if config[:container_name]
+          cmd << " --name #{config[:container_name]}"
+        elsif config[:instance_container_name]
+          cmd << " --name #{instance.name}"
+        end
         cmd << ' -P' if config[:publish_all]
         cmd << " -m #{config[:memory_limit]}" if config[:memory_limit]
         cmd << " -c #{config[:cpu_shares]}" if config[:cpu_shares]

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.15.1'
+    DOCKER_CLI_VERSION = '0.16.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen