kitchen-docker 1.0.0.beta → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +9 -1
  3. data/kitchen-docker.gemspec +2 -2
  4. data/lib/kitchen/driver/docker.rb +4 -1
  5. data/lib/kitchen/driver/docker_version.rb +1 -1
  6. metadata +11 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9c5f40664c9323956c6a379f32ad480297fba14b
4
- data.tar.gz: 1ffab2d47fca65dc72e45b12335cfba8a2160d18
3
+ metadata.gz: 84b7d803db9a4998483c78c06438fe6d5395153e
4
+ data.tar.gz: f64d333a6bfce736d274cde48abfbee0d13c12d8
5
5
  SHA512:
6
- metadata.gz: 59fd249b44942cbe78c3ca78d88c51cdb08fa75dd70dd3a61c993672aa745736a7d2a40f14c895b3267025020fd577765fc4e785a61d913b3d0d229a3d1cc45b
7
- data.tar.gz: f9dd3d4d44eb53c1252153020f847174df0160dc84339f6bbfeb03f0b93f32aaffd4562e1a3a97034b11c8c576a59e3fd0acf49a01ba083fb4fb608d0b0ab14a
6
+ metadata.gz: 4db58c3f968f4be85a6b4858552e442cabc485d4f2e7d3fc937262cf60f59c1c8e201dbcdeeef3f14174bfaf30da5f12d03aeb021179c7e86ce885c4f870ac5f
7
+ data.tar.gz: 683734d68c42584485b0eb05eb564cb4d3bb823aa623015449be4dcc878e9f0f7d3255cd9299718df76d6b6c8088f6979a9701dea1cdf2128d67053e06726b35
data/README.md CHANGED
@@ -14,7 +14,8 @@ Example `.kitchen.local.yml`:
14
14
 
15
15
  ```
16
16
  ---
17
- driver_plugin: docker
17
+ driver:
18
+ name: docker
18
19
 
19
20
  platforms:
20
21
  - name: ubuntu
@@ -142,6 +143,13 @@ driver_config:
142
143
  require_chef_omnibus: false
143
144
  ```
144
145
 
146
+ ### use\_cache
147
+
148
+ This determines if the Docker cache is used when provisioning the base for suite
149
+ containers.
150
+
151
+ The default value is `true`.
152
+
145
153
  ### remove\_images
146
154
 
147
155
  This determines if images are automatically removed when the suite container is
data/kitchen-docker.gemspec CHANGED
@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ['lib']
20
20
 
21
- spec.add_dependency 'test-kitchen', '>= 1.0.0.rc.2'
21
+ spec.add_dependency 'test-kitchen', '>= 1.0.0'
22
22
 
23
- spec.add_development_dependency 'bundler', '~> 1.3'
23
+ spec.add_development_dependency 'bundler'
24
24
  spec.add_development_dependency 'rake'
25
25
 
26
26
  spec.add_development_dependency 'cane'
data/lib/kitchen/driver/docker.rb CHANGED
@@ -28,6 +28,7 @@ module Kitchen
28
28
 
29
29
  default_config :socket, 'unix:///var/run/docker.sock'
30
30
  default_config :privileged, false
31
+ default_config :use_cache, true
31
32
  default_config :remove_images, false
32
33
  default_config :run_command, '/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no'
33
34
  default_config :username, 'kitchen'
@@ -145,7 +146,9 @@ module Kitchen
145
146
  end
146
147
 
147
148
  def build_image(state)
148
- output = docker_command("build -", :input => dockerfile)
149
+ cmd = "build"
150
+ cmd << " --no-cache" unless config[:use_cache]
151
+ output = docker_command("#{cmd} -", :input => dockerfile)
149
152
  parse_image_id(output)
150
153
  end
151
154
 
data/lib/kitchen/driver/docker_version.rb CHANGED
@@ -19,6 +19,6 @@ module Kitchen
19
19
  module Driver
20
20
 
21
21
  # Version string for Docker Kitchen driver
22
- DOCKER_VERSION = "1.0.0.beta"
22
+ DOCKER_VERSION = "1.0.0"
23
23
  end
24
24
  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: 1.0.0.beta
4
+ version: 1.0.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: 2014-03-20 00:00:00.000000000 Z
11
+ date: 2014-03-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 1.0.0.rc.2
19
+ version: 1.0.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: 1.0.0.rc.2
26
+ version: 1.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bundler
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '1.3'
33
+ version: '0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '1.3'
40
+ version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rake
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -129,12 +129,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
129
129
  version: '0'
130
130
  required_rubygems_version: !ruby/object:Gem::Requirement
131
131
  requirements:
132
- - - ">"
132
+ - - ">="
133
133
  - !ruby/object:Gem::Version
134
- version: 1.3.1
134
+ version: '0'
135
135
  requirements: []
136
136
  rubyforge_project:
137
- rubygems_version: 2.2.0
137
+ rubygems_version: 2.1.11
138
138
  signing_key:
139
139
  specification_version: 4
140
140
  summary: A Test Kitchen Driver for Docker