Skip to content

Commit

Permalink
Mage external_images function more readable
Browse files Browse the repository at this point in the history
by only excluding matched service images in one go
  • Loading branch information
andytson-inviqa committed Aug 11, 2020
1 parent ba93307 commit b8eca5d
Showing 1 changed file with 7 additions and 21 deletions.
28 changes: 7 additions & 21 deletions src/_base/harness/config/external-images.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,14 @@
function('external_images', [services]): |
#!php
$upstreamImages = $producedImages = [];
$upstreamImages = call_user_func_array(
'array_merge',
array_map(
function ($service) {
return $service['upstream'];
},
$services
)
);
$externalImages = array_filter(
$upstreamImages,
function ($image) use ($services) {
$serviceUpstreamImages = array_filter(
$services,
function ($service) use ($image) {
return $service['image'] == $image;
}
);
return count($serviceUpstreamImages) == 0;
foreach ($services as $service) {
if ($service['image']) {
$producedImages[] = $service['image']
}
);
$upstreamImages = array_merge($upstreamImages, $service['upstream']);
}
$externalImages = array_diff($upstreamImages, $producedImages);
# workspace commands don't allow non-string types
= join(' ', $externalImages);
Expand Down

0 comments on commit b8eca5d

Please sign in to comment.