MAGECLOUD-4925: Ability to support custom database parameters in docker image (#140)

Author: Yevhen Miroshnychenko

dist/mysql/mariadb.conf.d/example.cnf

@@ -0,0 +1,20 @@
+#
+# This directory will be mounted in the 'db' service as '/etc/mysql/mariadb.conf.d'
+# and read by /etc/mysql/conf.d/mariadb.cnf.
+# All *.cnf files from the configuration directory will be applied to MariaDB configuration
+#
+
+[client]
+#
+# Default is Latin1, if you need UTF-8 set this (also in server section)
+#default-character-set = utf8
+#
+
+[mysqld]
+#
+# * Character sets
+#
+# Default is Latin1, if you need UTF-8 set all this (also in client section)
+#
+#character_set_server   = utf8
+#collation_server       = utf8_general_ci

src/Compose/BuilderInterface.php

@@ -56,6 +56,7 @@ interface BuilderInterface
     public const VOLUME_MAGENTO_DEV = 'magento-dev';
     public const VOLUME_DOCKER_MNT = 'docker-mnt';
     public const VOLUME_DOCKER_ETRYPOINT = 'docker-entrypoint';
+    public const VOLUME_MARIADB_CONF = 'mariadb-conf';
 
     public const SYNC_ENGINE_NATIVE = 'native';
 

src/Compose/DeveloperBuilder.php

@@ -158,14 +158,14 @@ public function getPath(): string
      */
     private function getMagentoVolumes(Repository $config): array
     {
-        $target = self::DIR_MAGENTO;
-
         if ($config->get(self::KEY_SYNC_ENGINE) !== self::SYNC_ENGINE_NATIVE) {
-            $target .= ':nocopy';
+            return [
+                self::VOLUME_MAGENTO_SYNC . ':' . self::DIR_MAGENTO . ':nocopy'
+            ];
         }
 
         return [
-            self::VOLUME_MAGENTO_SYNC . ':' . $target . ':delegated',
+            self::VOLUME_MAGENTO_SYNC . ':' . self::DIR_MAGENTO . ':delegated',
         ];
     }
 }

src/Compose/ProductionBuilder.php

@@ -183,7 +183,14 @@ public function build(Repository $config): Manager
                     'device' => $this->resolver->getRootPath('/.docker/mysql/docker-entrypoint-initdb.d'),
                     'o' => 'bind'
                 ]
-            ]
+            ],
+            self::VOLUME_MARIADB_CONF => [
+                'driver_opts' => [
+                    'type' => 'none',
+                    'device' => $this->resolver->getRootPath('/.docker/mysql/mariadb.conf.d'),
+                    'o' => 'bind',
+                ],
+            ],
         ];
 
         if ($this->hasSelenium($config)) {
@@ -220,6 +227,16 @@ public function build(Repository $config): Manager
             $volumes[$volumeName] = $syncConfig;
         }
 
+        if ($config->get(self::KEY_SYNC_ENGINE) === self::SYNC_ENGINE_MOUNT) {
+            $volumes[self::VOLUME_MAGENTO] = [
+                'driver_opts' => [
+                    'type' => 'none',
+                    'device' => $this->resolver->getRootPath(),
+                    'o' => 'bind'
+                ]
+            ];
+        }
+
         $manager->addVolumes($volumes);
 
         $volumesBuild = $this->volumeResolver->normalize(array_merge(
@@ -249,7 +266,8 @@ public function build(Repository $config): Manager
                     'volumes' => array_merge(
                         [
                             self::VOLUME_MAGENTO_DB . ':/var/lib/mysql',
-                            self::VOLUME_DOCKER_ETRYPOINT . ':/docker-entrypoint-initdb.d'
+                            self::VOLUME_DOCKER_ETRYPOINT . ':/docker-entrypoint-initdb.d',
+                            self::VOLUME_MARIADB_CONF . ':/etc/mysql/mariadb.conf.d',
                         ],
                         $volumesMount
                     )