Skip to content

Commit ea6adc8

Browse files
Remove commands and shorten has_commands for effect on 1st run
1 parent 1b8ed29 commit ea6adc8

File tree

4 files changed

+5
-20
lines changed

4 files changed

+5
-20
lines changed

lib/puppet/provider/docker_compose/ruby.rb

+2-8
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,10 @@
66
desc 'Support for Puppet running Docker Compose'
77

88
mk_resource_methods
9-
commands dockercompose: 'docker-compose'
10-
commands dockercmd: 'docker'
119

12-
has_command(:docker, command(:dockercmd)) do
13-
environment(HOME: '/root')
14-
end
10+
has_command(:docker, 'docker')
1511

16-
has_command(:dockercompose, command(:dockercompose)) do
17-
environment(HOME: '/root')
18-
end
12+
has_command(:dockercompose, 'docker-compose')
1913

2014
def set_tmpdir
2115
return unless resource[:tmpdir]

lib/puppet/provider/docker_network/ruby.rb

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66
desc 'Support for Docker Networking'
77

88
mk_resource_methods
9-
commands dockercmd: 'docker'
109

11-
has_command(:docker, command(:dockercmd)) do
12-
environment(HOME: '/root')
13-
end
10+
has_command(:docker, 'docker')
1411

1512
def network_conf
1613
flags = ['network', 'create']

lib/puppet/provider/docker_stack/ruby.rb

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66
desc 'Support for Puppet running Docker Stacks'
77

88
mk_resource_methods
9-
commands dockercmd: 'docker'
109

11-
has_command(:docker, command(:dockercmd)) do
12-
environment(HOME: '/root')
13-
end
10+
has_command(:docker, 'docker')
1411

1512
def exists?
1613
Puppet.info("Checking for stack #{name}")

lib/puppet/provider/docker_volume/ruby.rb

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66
desc 'Support for Docker Volumes'
77

88
mk_resource_methods
9-
commands dockercmd: 'docker'
109

11-
has_command(:docker, command(:dockercmd)) do
12-
environment(HOME: '/root')
13-
end
10+
has_command(:docker, 'docker')
1411

1512
def volume_conf
1613
flags = ['volume', 'create']

0 commit comments

Comments
 (0)