|
23 | 23 | else |
24 | 24 | docker_args = '' |
25 | 25 | docker_network = 'bridge' |
26 | | - volume_location = '/opt' |
| 26 | + volume_location = '/opt/' |
27 | 27 | docker_image = 'hello-world:linux' |
28 | 28 | end |
29 | 29 |
|
|
33 | 33 | install_pp = "class { 'docker': #{docker_args}}" |
34 | 34 | apply_manifest(install_pp) |
35 | 35 | end |
36 | | - run_shell("mkdir #{volume_location}/volume_1") |
37 | | - run_shell("mkdir #{volume_location}/volume_2") |
| 36 | + run_shell("mkdir #{volume_location}volume_1") |
| 37 | + run_shell("mkdir #{volume_location}volume_2") |
38 | 38 | end |
39 | 39 |
|
40 | 40 | context 'when image is changed' do |
@@ -78,8 +78,8 @@ class {'docker': #{docker_args}} |
78 | 78 | volumes1 = "volumes => ['volume-1:C:\\volume_1']" |
79 | 79 | volumes2 = "volumes => ['volume-1:C:\\volume_1', 'volume-2:C:\\volume_2']" |
80 | 80 | else |
81 | | - volumes1 = "volumes => ['volume-1:#{volume_location}/volume_1']" |
82 | | - volumes2 = "volumes => ['volume-1:#{volume_location}/volume_1', 'volume-2:#{volume_location}/volume_2']" |
| 81 | + volumes1 = "volumes => ['volume-1:#{volume_location}volume_1']" |
| 82 | + volumes2 = "volumes => ['volume-1:#{volume_location}volume_1', 'volume-2:#{volume_location}volume_2']" |
83 | 83 | end |
84 | 84 |
|
85 | 85 | let(:pp1) do |
@@ -143,7 +143,7 @@ class {'docker': #{docker_args}} |
143 | 143 | end |
144 | 144 |
|
145 | 145 | after(:all) do |
146 | | - run_shell("rm -r #{volume_location}/volume_1") |
147 | | - run_shell("rm -r #{volume_location}/volume_2") |
| 146 | + run_shell("rm -r #{volume_location}volume_1") |
| 147 | + run_shell("rm -r #{volume_location}volume_2") |
148 | 148 | end |
149 | 149 | end |
0 commit comments