Skip to content

Commit 20775b1

Browse files
author
Mark Wilson
committed
making changes following review
1 parent 1fbf9b3 commit 20775b1

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ Give options to the ```docker-compose up``` command, such as ```--remove-orphans
563563
To supply multiple overide compose files add the following to the manifest file:
564564

565565
```puppet
566-
class {'docker::compose':
566+
class {'test':
567567
compose_files => ['master-docker-compose.yml', 'override-compose.yml],
568568
}
569569
```

spec/acceptance/compose_spec.rb

+8-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ class { 'docker::compose': }
2525
context 'Creating compose projects' do
2626
before(:all) do
2727
@install = <<-code
28-
docker_compose { '/tmp/docker-compose.yml':
28+
docker_compose { 'test3':
29+
compose_files => ['#{tmp_path}/docker-compose.yml'],
2930
ensure => present,
3031
}
3132
code
@@ -36,21 +37,23 @@ class { 'docker::compose': }
3637
apply_manifest(@install, :catch_changes=>true)
3738
end
3839

39-
describe command("docker inspect tmp_compose_test_1"), :sudo => true do
40+
describe command("docker inspect test3_compose_test_1"), :sudo => true do
4041
its(:exit_status) { should eq 0 }
4142
end
4243
end
4344

4445
context 'Destroying compose projects' do
4546
before(:all) do
4647
install = <<-code
47-
docker_compose { '/tmp/docker-compose.yml':
48+
docker_compose { 'test4':
49+
compose_files => ['#{tmp_path}/docker-compose.yml'],
4850
ensure => present,
4951
}
5052
code
5153
apply_manifest(install, :catch_failures=>true)
5254
@uninstall = <<-code
53-
docker_compose { '/tmp/docker-compose.yml':
55+
docker_compose { 'test4':
56+
compose_files => ['#{tmp_path}/docker-compose.yml'],
5457
ensure => absent,
5558
}
5659
code
@@ -61,7 +64,7 @@ class { 'docker::compose': }
6164
apply_manifest(@uninstall, :catch_changes=>true)
6265
end
6366

64-
describe command("docker inspect tmp_compose_test_1"), :sudo => true do
67+
describe command("docker inspect test4_compose_test_1"), :sudo => true do
6568
its(:exit_status) { should eq 1 }
6669
end
6770
end

spec/acceptance/compose_v3_spec.rb

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
require 'spec_helper_acceptance'
2-
require 'pry'
32

43
if fact('osfamily') == 'windows'
54
install_dir = '/cygdrive/c/Program Files/Docker'

0 commit comments

Comments
 (0)