File tree 1 file changed +6
-2
lines changed
lib/puppet/provider/docker_compose
1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ def exists?
31
31
end
32
32
33
33
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 )
35
35
Puppet . info ( "Checking for compose service #{ key } #{ image } " )
36
36
[ "#{ key } -#{ image } " , containers . count ( "#{ key } -#{ image } " ) ]
37
37
} . flatten ]
@@ -51,7 +51,11 @@ def exists?
51
51
def get_image ( service_name , compose_services )
52
52
image = compose_services [ service_name ] [ 'image' ]
53
53
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
55
59
end
56
60
image
57
61
end
You can’t perform that action at this time.
0 commit comments