kitchen-docker 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b939e9c2b0904be1588251727d88e41cdf7860c5
-  data.tar.gz: feeb4a93431ac53e63787d78b1430223e5340b30
+  metadata.gz: 8ac895bb5b0be3d5089efcadf3f6c6067d5603ce
+  data.tar.gz: 28f3c2dc7fcf14f09209cd81d2973dfee973299e
 SHA512:
-  metadata.gz: ce018dcd2008f84c802cb9050b05c84d239bcc903b53cdcee34791d40f4b4af3c39569df906b42a6b55a935850bd6c9e7562133ea201d6c58e2bcee0ede084b6
-  data.tar.gz: e6b5607abd8c8243d80aba28c04303e33d391cf3e09732d036634957cfc139cfa92248f26c158e4a39836ad4747c36fe73a9f124446d6eb205fef9f46c67dba8
+  metadata.gz: 5a33adf818806a487c6d2cf5584bfb09b3cffac4f178ddcdab6336e0cce961ee3375167127b6bef88015d516eec7894da4b62bb00ba07c654a0ac4bcb711b7b9
+  data.tar.gz: 16a68010bcb5ec673ef1e7f9f0f6a179514fb53777287da82871e24de6c2784b0bccd3dddc7d89341dae2c94e97ac5b2783679d2ec14881080515ec7bcb80a89

data/.kitchen.yml

@@ -39,6 +39,9 @@ platforms:
 suites:
   - name: default
   - name: concurrency
+  - name: context
+    driver:
+      build_context: false
   - name: capabilities
     excludes: [arch,unknown,centos-7,centos-6.4,dockerfile]
     driver:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.3.0
+
+* `build_context` option (boolean) to enable/disable sending the build
+context to Docker.
+
 ## 2.2.0
 
 * Use a temporary file for each suite instance Docker container

data/README.md

@@ -4,7 +4,7 @@ A Test Kitchen Driver for Docker.
 
 ## Requirements
 
-* [Docker][docker_installation] **(>= 1.2)**
+* [Docker][docker_installation] **(>= 1.5)**
 
 ## Installation and Setup
 
@@ -418,6 +418,20 @@ devices:
   - /dev/vboxnetctl
 ```
 
+### build_context
+
+Transfer the cookbook directory (cwd) as build context. This is required for
+Dockerfile commands like ADD and COPY. When using a remote Docker server, the
+whole directory has to be copied, which can be slow.
+
+The default value is `true` for local Docker and `false` for remote Docker.
+
+Examples:
+
+```yaml
+  build_context: true
+```
+
 ## Development
 
 * Source hosted at [GitHub][repo]

data/lib/kitchen/driver/docker.rb

@@ -66,6 +66,10 @@ module Kitchen
 
       default_config :disable_upstart, true
 
+      default_config :build_context do |driver|
+        !driver.remote_socket?
+      end
+
       def verify_dependencies
         run_command("#{config[:binary]} >> #{dev_null} 2>&1", :quiet => true)
         rescue
@@ -243,10 +247,12 @@ module Kitchen
       def build_image(state)
         cmd = "build"
         cmd << " --no-cache" unless config[:use_cache]
+        dockerfile_contents = dockerfile
+        build_context = config[:build_context] ? '.' : '-'
         output = Tempfile.create('Dockerfile-kitchen-', Dir.pwd) do |file|
-          file.write(dockerfile)
+          file.write(dockerfile_contents)
           file.close
-          docker_command("#{cmd} -f #{file.path} .")
+          docker_command("#{cmd} -f #{file.path} #{build_context}", :input => dockerfile_contents)
         end
         parse_image_id(output)
       end

data/lib/kitchen/driver/docker_version.rb

@@ -19,6 +19,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "2.2.0"
+    DOCKER_VERSION = "2.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen