Skip to content

Commit 30194fa

Browse files
florindragosdavejrt
authored andcommitted
Fix docker-compose provider to support images built on the fly (#320)
1 parent 9fc47a1 commit 30194fa

File tree

1 file changed

+6
-2
lines changed
  • lib/puppet/provider/docker_compose

1 file changed

+6
-2
lines changed

Diff for: lib/puppet/provider/docker_compose/ruby.rb

+6-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def exists?
3131
end
3232

3333
counts = Hash[*compose_services.each.map { |key, array|
34-
image = (array['image']) ? array['image'] : get_image(array['extends'], compose_services)
34+
image = (array['image']) ? array['image'] : get_image(key, compose_services)
3535
Puppet.info("Checking for compose service #{key} #{image}")
3636
["#{key}-#{image}", containers.count("#{key}-#{image}")]
3737
}.flatten]
@@ -51,7 +51,11 @@ def exists?
5151
def get_image(service_name, compose_services)
5252
image = compose_services[service_name]['image']
5353
unless image
54-
image = get_image(compose_services[service_name]['extends'], compose_services)
54+
if compose_services[service_name]['extends']
55+
image = get_image(compose_services[service_name]['extends'], compose_services)
56+
elsif compose_services[service_name]['build']
57+
image = "#{project}_#{service_name}"
58+
end
5559
end
5660
image
5761
end

0 commit comments

Comments
 (0)