MCLOUD-7095: Remove alpine image from generic service (#5)

Author: oshmyheliuk

src/Compose/ProductionBuilder/Service/Generic.php

@@ -13,6 +13,7 @@
 use Magento\CloudDocker\Config\Config;
 use Magento\CloudDocker\Config\Environment\Converter;
 use Magento\CloudDocker\Service\ServiceFactory;
+use Magento\CloudDocker\Service\ServiceInterface;
 
 /**
  * Returns Generic service configuration
@@ -72,7 +73,7 @@ public function getConfig(Config $config): array
     {
         return $this->serviceFactory->create(
             $this->getServiceName(),
-            $config->getServiceVersion($this->getServiceName()),
+            $config->getServiceVersion(ServiceInterface::SERVICE_PHP),
             [
                 'env_file' => './.docker/config.env',
                 'environment' => $this->converter->convert(

src/Service/ServiceFactory.php

@@ -109,9 +109,9 @@ class ServiceFactory
             'pattern' => self::PATTERN_STD
         ],
         ServiceInterface::SERVICE_GENERIC => [
-            'image' => 'alpine',
+            'image' => 'magento/magento-cloud-docker-php',
             'version' => 'latest',
-            'pattern' => self::PATTERN_STD
+            'pattern' => '%s:%s-cli-%s'
         ],
         ServiceInterface::SERVICE_SELENIUM => [
             'image' => 'selenium/standalone-chrome',

src/Test/Integration/_files/cloud_base/docker-compose.exp.yml

@@ -119,7 +119,7 @@ services:
         condition: service_started
   generic:
     hostname: generic.magento2.docker
-    image: 'alpine:latest'
+    image: 'magento/magento-cloud-docker-php:7.3-cli-1.1'
     env_file: ./.docker/config.env
     environment:
       - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'

src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml

@@ -173,7 +173,7 @@ services:
         condition: service_started
   generic:
     hostname: generic.magento2.docker
-    image: 'alpine:latest'
+    image: 'magento/magento-cloud-docker-php:7.3-cli-1.1'
     env_file: ./.docker/config.env
     environment:
       - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'

src/Test/Integration/_files/cloud_base_test/docker-compose.exp.yml

@@ -160,7 +160,7 @@ services:
         condition: service_started
   generic:
     hostname: generic.magento2.docker
-    image: 'alpine:latest'
+    image: 'magento/magento-cloud-docker-php:7.3-cli-1.1'
     env_file: ./.docker/config.env
     environment:
       - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'

src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml

@@ -93,7 +93,7 @@ services:
         condition: service_started
   generic:
     hostname: generic.magento2.test
-    image: 'alpine:latest'
+    image: 'magento/magento-cloud-docker-php:7.2-cli-1.1'
     env_file: ./.docker/config.env
     environment:
       - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl'