Skip to content

Commit 5543d63

Browse files
Merge pull request #631 from awegmann/master
Fixing the fix 'Fix the docker_compose options parameter position #378'
2 parents 51e2886 + cf3955b commit 5543d63

File tree

1 file changed

+5
-5
lines changed
  • lib/puppet/provider/docker_compose

1 file changed

+5
-5
lines changed

lib/puppet/provider/docker_compose/ruby.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -78,24 +78,24 @@ def create
7878
return unless resource[:scale]
7979
instructions = resource[:scale].map { |k, v| "#{k}=#{v}" }
8080
Puppet.info("Scaling compose project #{name}: #{instructions.join(' ')}")
81-
args = [compose_files, '-p', name, 'scale'].insert(2, resource[:options]).compact + instructions
81+
args = [compose_files, '-p', name, 'scale'].insert(3, resource[:options]).compact + instructions
8282
dockercompose(args)
8383
end
8484

8585
def destroy
8686
Puppet.info("Removing all containers for compose project #{name}")
87-
kill_args = [compose_files, '-p', name, 'kill'].insert(2, resource[:options]).compact
87+
kill_args = [compose_files, '-p', name, 'kill'].insert(3, resource[:options]).compact
8888
dockercompose(kill_args)
89-
rm_args = [compose_files, '-p', name, 'rm', '--force', '-v'].insert(2, resource[:options]).compact
89+
rm_args = [compose_files, '-p', name, 'rm', '--force', '-v'].insert(3, resource[:options]).compact
9090
dockercompose(rm_args)
9191
end
9292

9393
def restart
9494
return unless exists?
9595
Puppet.info("Rebuilding and Restarting all containers for compose project #{name}")
96-
kill_args = [compose_files, '-p', name, 'kill'].insert(2, resource[:options]).compact
96+
kill_args = [compose_files, '-p', name, 'kill'].insert(3, resource[:options]).compact
9797
dockercompose(kill_args)
98-
build_args = [compose_files, '-p', name, 'build'].insert(2, resource[:options]).compact
98+
build_args = [compose_files, '-p', name, 'build'].insert(3, resource[:options]).compact
9999
dockercompose(build_args)
100100
create
101101
end

0 commit comments

Comments
 (0)