From 07bf9498b203e08377a0fe157f0cd51c4faea53e Mon Sep 17 00:00:00 2001 From: Mathieu CARROLLE Date: Tue, 10 Sep 2024 17:06:50 +0200 Subject: [PATCH 1/2] Change type of up_args param for docker_compose type --- lib/puppet/type/docker_compose.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/type/docker_compose.rb b/lib/puppet/type/docker_compose.rb index c5f50851..718b1616 100644 --- a/lib/puppet/type/docker_compose.rb +++ b/lib/puppet/type/docker_compose.rb @@ -28,7 +28,7 @@ def refresh newparam(:up_args) do desc 'Arguments to be passed directly to docker-compose up.' validate do |value| - raise _('up_args should be a String') unless value.is_a? String + raise _('up_args should be a String') unless value.is_a? Array end end From 4b5748f8a69cf2c6fcacad7e0d591ff2ac8a495c Mon Sep 17 00:00:00 2001 From: Mathieu CARROLLE Date: Tue, 10 Sep 2024 17:07:58 +0200 Subject: [PATCH 2/2] Fix up_args param position --- lib/puppet/provider/docker_compose/ruby.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/docker_compose/ruby.rb b/lib/puppet/provider/docker_compose/ruby.rb index b1c1b15f..5573d69d 100644 --- a/lib/puppet/provider/docker_compose/ruby.rb +++ b/lib/puppet/provider/docker_compose/ruby.rb @@ -74,7 +74,7 @@ def get_image(service_name, compose_services) def create Puppet.info("Running compose project #{name}") - args = ['compose', compose_files, '-p', name, 'up', '-d', '--remove-orphans'].insert(3, resource[:options]).insert(5, resource[:up_args]).compact + args = ['compose', compose_files, '-p', name, resource[:options], 'up', resource[:up_args], '-d', '--remove-orphans'].flatten.compact docker(args) return unless resource[:scale]