Skip to content

Commit 8167cd5

Browse files
authored
Merge pull request #820 from puppetlabs/GH-819-permission_denied_from_mkdir
Fix permission denied issue introduced in v4.2.0
2 parents d2c44c5 + a34a1e2 commit 8167cd5

File tree

4 files changed

+1
-26
lines changed

4 files changed

+1
-26
lines changed

lib/puppet/provider/docker_compose/ruby.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
end
1515

1616
has_command(:docker_compose, command(:dockercompose)) do
17-
Dir.mkdir('/tmp_docker') unless Dir.exist?('/tmp_docker')
18-
ENV.store('TMPDIR', '/tmp_docker')
17+
environment(HOME: '/root')
1918
end
2019

2120
def exists?

spec/classes/init_spec.rb

-6
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,6 @@
196196
}
197197
else
198198
it {
199-
# Stub /tmp_docker dir to prevent shelling out during spec test
200-
allow(Dir).to receive(:exist?).and_wrap_original do |original_method, a|
201-
original_method.call(a)
202-
end
203-
allow(Dir).to receive(:exist?).with('/tmp_docker').and_return(true)
204-
205199
is_expected.to contain_class('docker::repos').that_comes_before('Class[docker::install]')
206200
is_expected.to contain_class('docker::install').that_comes_before('Class[docker::config]')
207201
is_expected.to contain_class('docker::config').that_comes_before('Class[docker::service]')

spec/defines/registry_spec.rb

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22

33
require 'spec_helper'
44

5-
# Stub /tmp_docker dir to prevent shelling out during spec test
6-
class Dir
7-
class << self
8-
def exist?(var)
9-
return true if var == '/tmp_docker'
10-
end
11-
end
12-
end
13-
145
tests = {
156
'with ensure => absent' => {
167
'ensure' => 'absent',

spec/unit/lib/puppet/type/docker_compose_spec.rb

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22

33
require 'spec_helper'
44

5-
# Stub /tmp_docker dir to prevent shelling out during spec test
6-
class Dir
7-
class << self
8-
def exist?(var)
9-
return true if var == '/tmp_docker'
10-
end
11-
end
12-
end
13-
145
compose = Puppet::Type.type(:docker_compose)
156

167
describe compose do

0 commit comments

Comments
 (0)