kitchen-docker_cli 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c75bef1be02229951e309089476996c89eedd4
-  data.tar.gz: 208335c455ac0e33b9288a20c62b6e7b314f66e7
+  metadata.gz: 891eba7c6a7936337875c7e2c019e5e9cb8ee836
+  data.tar.gz: e3cffe6b317c03a15ad962dd1097772aa295fed7
 SHA512:
-  metadata.gz: 4d76af1e6d52ad14d63af9f278032a7a1191a4d2fc1f98adfc4f043c72f5fc4dc2de54d20a8a768f659c436afa06f464186308945e2c8f5054d4ab7b7f4b6a0f
-  data.tar.gz: 5acc2d85837073b3c7ee3a58f4363ce1e4ea624dd25dcfc92f9c24e0acc42264e081772ede8008772ec2ca60835f856c8dc967138b3e2e98cb41a95fe20c31c3
+  metadata.gz: 580b247a7529255ca75d15eb832347a3ae6dc717d3dc3189036e6b31e538d86f836c05986f690f5eebdfac1f558f6db9ddf536cc0ad8228cc14759e4d69566ba
+  data.tar.gz: 193bbdeb76dac5e26f2c33d882b7c802c4e63805fbc1791638826758eb036080b10bbe20ea6e51ccfd2fadb51f685b62756f1608b955706339972a4e3d9773fe

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.10.0
+
+* Add `volumes_from` option
+
 ## 0.9.1
 
 * Bugfix

data/README.md

@@ -255,6 +255,22 @@ Examples:
     - <%= Dir::pwd %>:/var:rw
 ```
 
+### volumes_from
+
+Mount data volume(s) from other container(s).
+
+Examples:
+
+```yml
+  volumes_from: container_name
+```
+
+```yml
+  volumes_from:
+    - container_a
+    - container_b
+```
+
 ### dockerfile
 
 Create test image using a supplied Dockerfile, instead of the default Dockerfile created.  

data/lib/kitchen/driver/docker_cli.rb

@@ -103,6 +103,7 @@ module Kitchen
         end
         Array(config[:publish]).each { |pub| cmd << " -p #{pub}" }
         Array(config[:volume]).each { |vol| cmd << " -v #{vol}" }
+        Array(config[:volumes_from]).each { |vf| cmd << " --volumes-from #{vf}" }
         Array(config[:link]).each { |link| cmd << " --link #{link}" }
         cmd << " #{image} #{config[:command]}"
       end

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.9.1'
+    DOCKER_CLI_VERSION = '0.10.0'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -118,6 +118,7 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
         :privileged => true,
         :publish => ['80:8080', '22:2222'],
         :volume => '/dev:/dev',
+        :volumes_from => 'data',
         :link => 'mysql:db',
         :memory_limit => '256m',
         :cpu_shares => 512,
@@ -128,7 +129,7 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
     end
 
     example do
-      cmd = "run -d -t --name web -P -m 256m -c 512 --privileged --net none -h example.local -p 80:8080 -p 22:2222 -v /dev:/dev --link mysql:db test /bin/bash"
+      cmd = "run -d -t --name web -P -m 256m -c 512 --privileged --net none -h example.local -p 80:8080 -p 22:2222 -v /dev:/dev --volumes-from data --link mysql:db test /bin/bash"
       expect(@docker_cli.docker_run_command('test')).to eq cmd
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -110,7 +110,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- circle.yml
 - integration-test/.gitignore
 - integration-test/.kitchen.yml
 - integration-test/Gemfile

data/circle.yml

@@ -1,15 +0,0 @@
----
-machine:
-  ruby:
-    version: 2.1.5
-  services:
-    - docker
-
-dependencies:
-  override:
-    - bundle install --path=vendor/bundle:
-        pwd: integration-test
-test:
-  override:
-    - bundle exec kitchen test:
-        pwd: integration-test