MCLOUD-5691: Add support for MySQL #189 (#206)

Author: shiftedreality

src/Command/BuildCompose.php

@@ -102,6 +102,12 @@ protected function configure(): void
                 InputOption::VALUE_REQUIRED,
                 'DB version'
             )->addOption(
+                Source\CliSource::OPTION_DB_IMAGE,
+                null,
+                InputOption::VALUE_REQUIRED,
+                'DB image'
+            )
+            ->addOption(
                 Source\CliSource::OPTION_EXPOSE_DB_PORT,
                 null,
                 InputOption::VALUE_REQUIRED,

src/Compose/ProductionBuilder.php

@@ -205,16 +205,16 @@ public function build(Config $config): Manager
             $this->getVolumeConfig('/.docker/mysql/mariadb.conf.d')
         );
 
-        $this->addDbService(self::SERVICE_DB, $manager, $dbVersion, $volumesMount, $config);
+        $this->addDbService($manager, $config, self::SERVICE_DB, $dbVersion, $volumesMount);
 
         if ($config->hasServiceEnabled(ServiceInterface::SERVICE_DB_QUOTE)) {
             $cliDepends = array_merge($cliDepends, [self::SERVICE_DB_QUOTE => ['condition' => 'service_started']]);
-            $this->addDbService(self::SERVICE_DB_QUOTE, $manager, $dbVersion, $volumesMount, $config);
+            $this->addDbService($manager, $config, self::SERVICE_DB_QUOTE, $dbVersion, $volumesMount);
         }
 
         if ($config->hasServiceEnabled(ServiceInterface::SERVICE_DB_SALES)) {
             $cliDepends = array_merge($cliDepends, [self::SERVICE_DB_SALES => ['condition' => 'service_started']]);
-            $this->addDbService(self::SERVICE_DB_SALES, $manager, $dbVersion, $volumesMount, $config);
+            $this->addDbService($manager, $config, self::SERVICE_DB_SALES, $dbVersion, $volumesMount);
         }
 
         $esEnvVars = $config->get(SourceInterface::SERVICES_ES_VARS);
@@ -463,11 +463,11 @@ public function getPath(): string
      * @throws GenericException
      */
     private function addDbService(
-        string $service,
         Manager $manager,
+        Config $config,
+        string $service,
         string $version,
-        array $mounts,
-        Config $config
+        array $mounts
     ): void {
         $volumePrefix = $config->getNameWithPrefix();
         $mounts[] = $volumePrefix . self::VOLUME_MARIADB_CONF . ':/etc/mysql/mariadb.conf.d';
@@ -548,7 +548,8 @@ private function addDbService(
             $this->serviceFactory->create(
                 $serviceType,
                 $version,
-                $dbConfig
+                $dbConfig,
+                $config->getServiceImage(ServiceInterface::SERVICE_DB)
             ),
             [self::NETWORK_MAGENTO],
             []

src/Config/Source/CliSource.php

@@ -21,6 +21,7 @@ class CliSource implements SourceInterface
     public const OPTION_PHP = 'php';
     public const OPTION_NGINX = 'nginx';
     public const OPTION_DB = 'db';
+    public const OPTION_DB_IMAGE = 'db-image';
     public const OPTION_EXPOSE_DB_PORT = 'expose-db-port';
     public const OPTION_EXPOSE_DB_QUOTE_PORT = 'expose-db-quote-port';
     public const OPTION_EXPOSE_DB_SALES_PORT = 'expose-db-sales-port';
@@ -166,6 +167,12 @@ public function read(): Repository
             ]);
         }
 
+        if ($dbImage = $this->input->getOption(self::OPTION_DB_IMAGE)) {
+            $repository->set([
+                self::SERVICES_DB_IMAGE => $dbImage
+            ]);
+        }
+
         if ($this->input->getOption(self::OPTION_NO_TMP_MOUNTS)) {
             $repository->set(self::SYSTEM_TMP_MOUNTS, false);
         }

src/Config/Source/CloudSource.php

@@ -174,7 +174,9 @@ private function addRelationships(Repository $repository, array $relationships):
                     continue;
                 }
 
-                if ($repository->has(self::SERVICES . '.' . $service) && $service != ServiceInterface::SERVICE_DB) {
+                if ($service !== ServiceInterface::SERVICE_DB
+                    && $repository->has(self::SERVICES . '.' . $service)
+                ) {
                     throw new SourceException(sprintf(
                         'Only one instance of service "%s" supported',
                         $service
@@ -185,9 +187,7 @@ private function addRelationships(Repository $repository, array $relationships):
                     $repository->set([
                         self::SERVICES . '.' . $service . '.enabled' => true,
                         self::SERVICES . '.' . $service . '.version' => $version,
-                        self::SERVICES . '.' . $service . '.image' => $this->serviceFactory->getDefaultImage(
-                            $service
-                        )
+                        self::SERVICES . '.' . $service . '.image' => $this->serviceFactory->getDefaultImage($service)
                     ]);
                 } catch (ConfigurationMismatchException $exception) {
                     throw new SourceException($exception->getMessage(), $exception->getCode(), $exception);

src/Config/Source/SourceInterface.php

@@ -48,6 +48,7 @@ interface SourceInterface
      * DB
      */
     public const SERVICES_DB = self::SERVICES . '.' . ServiceInterface::SERVICE_DB;
+    public const SERVICES_DB_IMAGE = self::SERVICES_DB . '.image';
 
     /**
      * DB quote

src/Test/Integration/BuildCustomComposeTest.php

@@ -97,6 +97,7 @@ public function buildDataProvider(): array
                                 ],
                                 'mysql' => [
                                     'version' => '10.0',
+                                    'image' => 'mariadb',
                                     'enabled' => true,
                                 ],
                             ],