From 59e8a22797bc4791bf3837fcd026a253dcd3715d Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Tue, 1 Oct 2024 16:43:51 +0200 Subject: [PATCH] fix: image names for otel --- matrix.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/matrix.php b/matrix.php index 3bf391e..dba8cd6 100644 --- a/matrix.php +++ b/matrix.php @@ -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; } } @@ -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); } @@ -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' ]);