kitchen-docker_cli 0.11.0 → 0.11.1
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.
- checksums.yaml +4 -4
- data/.kitchen.yml +10 -5
- data/CHANGELOG.md +4 -0
- data/Gemfile +4 -0
- data/lib/kitchen/driver/docker_cli_version.rb +1 -1
- data/lib/kitchen/transport/docker_cli.rb +5 -2
- data/test/integration/ansible/default.yml +6 -0
- metadata +4 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4273d3d6bf927a7ce2dca8540e733535ffd0c208
|
|
4
|
+
data.tar.gz: 7764769af88c2e1d2a06b31ac16d8736c475992e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 629a1b67b17130b7ffe6136879ff894e43ee8355ead7d95cc49ffa6da730b960388bf241f994d3123118829f00f23ca3259cd241b90f5320ec5610efc443d4c2
|
|
7
|
+
data.tar.gz: ab942b9b5fd21556f87d846ddb47a61f0281710ee99c9364bacf216578e4646e511b73b56bad12303b31b9316fe0e33435a29ed6fbb20ad850910b81d692c9a9
|
data/.kitchen.yml
CHANGED
|
@@ -5,14 +5,19 @@ driver:
|
|
|
5
5
|
transport:
|
|
6
6
|
name: docker_cli
|
|
7
7
|
|
|
8
|
-
driver_config:
|
|
9
|
-
hostname: example.local
|
|
10
|
-
|
|
11
8
|
platforms:
|
|
12
9
|
# - name: ubuntu-12.04
|
|
13
|
-
|
|
10
|
+
- name: ubuntu-14.04
|
|
14
11
|
- name: centos-6.6
|
|
15
12
|
# - name: fedora-20
|
|
16
13
|
|
|
17
14
|
suites:
|
|
18
|
-
- name:
|
|
15
|
+
- name: chef
|
|
16
|
+
provisioner:
|
|
17
|
+
name: chef_zero
|
|
18
|
+
|
|
19
|
+
- name: ansible
|
|
20
|
+
provisioner:
|
|
21
|
+
name: ansible_playbook
|
|
22
|
+
playbook: test/integration/ansible/default.yml
|
|
23
|
+
hosts: 127.0.0.1
|
data/CHANGELOG.md
CHANGED
data/Gemfile
CHANGED
|
@@ -50,8 +50,10 @@ module Kitchen
|
|
|
50
50
|
end
|
|
51
51
|
|
|
52
52
|
def execute(command)
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
if command
|
|
54
|
+
exec_cmd = docker_exec_command(@options[:container_id], command, :tty => true)
|
|
55
|
+
run_docker(exec_cmd)
|
|
56
|
+
end
|
|
55
57
|
end
|
|
56
58
|
|
|
57
59
|
def run_docker(command, options={})
|
|
@@ -73,6 +75,7 @@ module Kitchen
|
|
|
73
75
|
exec_cmd = "exec"
|
|
74
76
|
exec_cmd << " -t" if opt[:tty]
|
|
75
77
|
exec_cmd << " -i" if opt[:interactive]
|
|
78
|
+
cmd = Util.wrap_command(cmd.gsub('\'', '"')) unless cmd.match(/\Ash\s\-c/)
|
|
76
79
|
exec_cmd << " #{container_id} #{cmd}"
|
|
77
80
|
end
|
|
78
81
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kitchen-docker_cli
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.11.
|
|
4
|
+
version: 0.11.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Masashi Terui
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-06-
|
|
11
|
+
date: 2015-06-19 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: test-kitchen
|
|
@@ -128,6 +128,7 @@ files:
|
|
|
128
128
|
- spec/kitchen/driver/dockerfile.erb
|
|
129
129
|
- spec/kitchen/driver/dockerfile_nil.erb
|
|
130
130
|
- spec/spec_helper.rb
|
|
131
|
+
- test/integration/ansible/default.yml
|
|
131
132
|
homepage: https://github.com/marcy-terui/kitchen-docker_cli
|
|
132
133
|
licenses:
|
|
133
134
|
- Apache 2.0
|
|
@@ -157,3 +158,4 @@ test_files:
|
|
|
157
158
|
- spec/kitchen/driver/dockerfile.erb
|
|
158
159
|
- spec/kitchen/driver/dockerfile_nil.erb
|
|
159
160
|
- spec/spec_helper.rb
|
|
161
|
+
- test/integration/ansible/default.yml
|