MCLOUD-6028: Fix failed tests magento-cloud-docker (#219)

Author: BaDos

composer.json

@@ -19,12 +19,15 @@
         "symfony/yaml": "^3.3||^4.0"
     },
     "require-dev": {
+        "codeception/codeception": "^4.1",
+        "codeception/module-asserts": "^1.2",
+        "codeception/module-db": "^1.0",
+        "codeception/module-phpbrowser": "^1.0",
+        "consolidation/robo": "^1.2",
         "phpmd/phpmd": "@stable",
         "phpstan/phpstan": "^0.11",
         "phpunit/phpunit": "^8.5",
-        "squizlabs/php_codesniffer": "^3.0",
-        "codeception/codeception": "^4.1",
-        "consolidation/robo": "^1.2"
+        "squizlabs/php_codesniffer": "^3.0"
     },
     "bin": [
         "bin/ece-docker"

src/Compose/ProductionBuilder.php

@@ -224,21 +224,30 @@ public function build(Config $config): Manager
                 continue;
             }
 
+            switch ($service) {
+                case self::SERVICE_REDIS:
+                    $serviceConfig = [self::SERVICE_HEALTHCHECK => [
+                        'test'=> 'redis-cli ping || exit 1',
+                        'interval'=> '30s',
+                        'timeout'=> '30s',
+                        'retries'=> 3
+                    ]];
+                    break;
+
+                case self::SERVICE_ELASTICSEARCH:
+                    $serviceConfig = !empty($esEnvVars) ? ['environment' => $esEnvVars] : [];
+                    break;
+
+                default:
+                    $serviceConfig = [];
+            }
+
             $manager->addService(
                 $service,
                 $this->serviceFactory->create(
                     (string)$service,
                     (string)$config->getServiceVersion($service),
-                    self::SERVICE_ELASTICSEARCH === $service && !empty($esEnvVars)
-                        ? ['environment' => $esEnvVars]
-                        : self::SERVICE_REDIS === $service
-                        ? [self::SERVICE_HEALTHCHECK => [
-                            'test'=> 'redis-cli ping || exit 1',
-                            'interval'=> '30s',
-                            'timeout'=> '30s',
-                            'retries'=> 3
-                        ] ]
-                        : []
+                    $serviceConfig
                 ),
                 [self::NETWORK_MAGENTO],
                 []