Skip to content

Commit

Permalink
fix: image names for otel
Browse files Browse the repository at this point in the history
  • Loading branch information
shyim committed Oct 1, 2024
1 parent 66064f3 commit 59e8a22
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions matrix.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ function get_digest_of_image(string $imageName, string $tag): string {

foreach ($apiResponse['results'] as $entry) {
preg_match($versionRegex, $entry['name'], $rcVersion);

if (strpos($entry['name'], 'RC') !== false && !in_array($rcVersion['version'], $rcVersions)) {
continue;
}

if (preg_match($versionRegex, $entry['name'], $patchVersion)) {
if (in_array($patchVersion['version'], $disallowedVersions, true)) {
$patchVersion = null;
continue;
}

break;
}
}
Expand All @@ -67,7 +67,7 @@ function get_digest_of_image(string $imageName, string $tag): string {
}

} while($page++ < 5);

if ($patchVersion === null) {
throw new \RuntimeException('There is no version found for PHP ' . $supportedVersion);
}
Expand Down Expand Up @@ -118,7 +118,7 @@ function get_digest_of_image(string $imageName, string $tag): string {
'shopware/docker-base:' . $imageTagPrefix . $patchVersion['version'] . '-fpm'
]);

$fpmImagesOtel = array_merge($fpmImages, [
$fpmImagesOtel = array_merge($fpmImagesOtel, [
'shopware/docker-base:' . $imageTagPrefix . $supportedVersion . '-fpm-otel',
'shopware/docker-base:' . $imageTagPrefix . $patchVersion['version'] . '-fpm-otel'
]);
Expand Down

0 comments on commit 59e8a22

Please sign in to comment.