kitchen-docker 2.2.0 → 2.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.kitchen.yml +3 -0
- data/CHANGELOG.md +5 -0
- data/README.md +15 -1
- data/lib/kitchen/driver/docker.rb +8 -2
- data/lib/kitchen/driver/docker_version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8ac895bb5b0be3d5089efcadf3f6c6067d5603ce
|
4
|
+
data.tar.gz: 28f3c2dc7fcf14f09209cd81d2973dfee973299e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5a33adf818806a487c6d2cf5584bfb09b3cffac4f178ddcdab6336e0cce961ee3375167127b6bef88015d516eec7894da4b62bb00ba07c654a0ac4bcb711b7b9
|
7
|
+
data.tar.gz: 16a68010bcb5ec673ef1e7f9f0f6a179514fb53777287da82871e24de6c2784b0bccd3dddc7d89341dae2c94e97ac5b2783679d2ec14881080515ec7bcb80a89
|
data/.kitchen.yml
CHANGED
data/CHANGELOG.md
CHANGED
data/README.md
CHANGED
@@ -4,7 +4,7 @@ A Test Kitchen Driver for Docker.
|
|
4
4
|
|
5
5
|
## Requirements
|
6
6
|
|
7
|
-
* [Docker][docker_installation] **(>= 1.
|
7
|
+
* [Docker][docker_installation] **(>= 1.5)**
|
8
8
|
|
9
9
|
## Installation and Setup
|
10
10
|
|
@@ -418,6 +418,20 @@ devices:
|
|
418
418
|
- /dev/vboxnetctl
|
419
419
|
```
|
420
420
|
|
421
|
+
### build_context
|
422
|
+
|
423
|
+
Transfer the cookbook directory (cwd) as build context. This is required for
|
424
|
+
Dockerfile commands like ADD and COPY. When using a remote Docker server, the
|
425
|
+
whole directory has to be copied, which can be slow.
|
426
|
+
|
427
|
+
The default value is `true` for local Docker and `false` for remote Docker.
|
428
|
+
|
429
|
+
Examples:
|
430
|
+
|
431
|
+
```yaml
|
432
|
+
build_context: true
|
433
|
+
```
|
434
|
+
|
421
435
|
## Development
|
422
436
|
|
423
437
|
* Source hosted at [GitHub][repo]
|
@@ -66,6 +66,10 @@ module Kitchen
|
|
66
66
|
|
67
67
|
default_config :disable_upstart, true
|
68
68
|
|
69
|
+
default_config :build_context do |driver|
|
70
|
+
!driver.remote_socket?
|
71
|
+
end
|
72
|
+
|
69
73
|
def verify_dependencies
|
70
74
|
run_command("#{config[:binary]} >> #{dev_null} 2>&1", :quiet => true)
|
71
75
|
rescue
|
@@ -243,10 +247,12 @@ module Kitchen
|
|
243
247
|
def build_image(state)
|
244
248
|
cmd = "build"
|
245
249
|
cmd << " --no-cache" unless config[:use_cache]
|
250
|
+
dockerfile_contents = dockerfile
|
251
|
+
build_context = config[:build_context] ? '.' : '-'
|
246
252
|
output = Tempfile.create('Dockerfile-kitchen-', Dir.pwd) do |file|
|
247
|
-
file.write(
|
253
|
+
file.write(dockerfile_contents)
|
248
254
|
file.close
|
249
|
-
docker_command("#{cmd} -f #{file.path}
|
255
|
+
docker_command("#{cmd} -f #{file.path} #{build_context}", :input => dockerfile_contents)
|
250
256
|
end
|
251
257
|
parse_image_id(output)
|
252
258
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kitchen-docker
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.3.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean Porter
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-07-
|
11
|
+
date: 2015-07-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: test-kitchen
|