MAGECLOUD-4170: Add Support for Local Mounts to Production Mode in Cl… (#138)

Author: shiftedreality

src/Command/BuildCompose.php

@@ -23,7 +23,7 @@
 use Symfony\Component\Yaml\Yaml;
 
 /**
- * Builds Docker configuration for Magento project.
+ * Builds Docker configuration for Magento project
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -55,7 +55,7 @@ class BuildCompose extends Command
     private const OPTION_WITH_SELENIUM = 'with-selenium';
 
     /**
-     * Option key to config name map.
+     * Option key to config name map
      *
      * @var array
      */
@@ -72,6 +72,16 @@ class BuildCompose extends Command
         self::OPTION_SELENIUM_IMAGE => ServiceFactory::SERVICE_SELENIUM_IMAGE
     ];
 
+    /**
+     * Available engines per mode
+     *
+     * @var array
+     */
+    private static $enginesMap = [
+        BuilderFactory::BUILDER_DEVELOPER => DeveloperBuilder::SYNC_ENGINES_LIST,
+        BuilderFactory::BUILDER_PRODUCTION => ProductionBuilder::SYNC_ENGINES_LIST
+    ];
+
     /**
      * @var BuilderFactory
      */
@@ -205,9 +215,10 @@ protected function configure(): void
                 InputOption::VALUE_REQUIRED,
                 sprintf(
                     'File sync engine. Works only with developer mode. Available: (%s)',
-                    implode(', ', DeveloperBuilder::SYNC_ENGINES_LIST)
-                ),
-                DeveloperBuilder::SYNC_ENGINE_NATIVE
+                    implode(', ', array_unique(
+                        array_merge(DeveloperBuilder::SYNC_ENGINES_LIST, ProductionBuilder::SYNC_ENGINES_LIST)
+                    ))
+                )
             )
             ->addOption(
                 self::OPTION_NO_CRON,
@@ -237,22 +248,28 @@ protected function configure(): void
      */
     public function execute(InputInterface $input, OutputInterface $output)
     {
-        $type = $input->getOption(self::OPTION_MODE);
+        $mode = $input->getOption(self::OPTION_MODE);
         $syncEngine = $input->getOption(self::OPTION_SYNC_ENGINE);
 
-        $builder = $this->builderFactory->create($type);
-        $config = $this->configFactory->create();
+        if ($mode === BuilderFactory::BUILDER_DEVELOPER && $syncEngine === null) {
+            $syncEngine = DeveloperBuilder::DEFAULT_SYNC_ENGINE;
+        } elseif ($mode === BuilderFactory::BUILDER_PRODUCTION && $syncEngine === null) {
+            $syncEngine = ProductionBuilder::DEFAULT_SYNC_ENGINE;
+        }
 
-        if (BuilderFactory::BUILDER_DEVELOPER === $type
-            && !in_array($syncEngine, DeveloperBuilder::SYNC_ENGINES_LIST, true)
+        if (isset(self::$enginesMap[$mode])
+            && !in_array($syncEngine, self::$enginesMap[$mode], true)
         ) {
             throw new GenericException(sprintf(
                 "File sync engine '%s' is not supported. Available: %s",
                 $syncEngine,
-                implode(', ', DeveloperBuilder::SYNC_ENGINES_LIST)
+                implode(', ', self::$enginesMap[$mode])
             ));
         }
 
+        $builder = $this->builderFactory->create($mode);
+        $config = $this->configFactory->create();
+
         array_walk(self::$optionsMap, static function ($key, $option) use ($config, $input) {
             if ($value = $input->getOption($option)) {
                 $config->set($key, $value);

src/Compose/BuilderInterface.php

@@ -24,6 +24,7 @@ interface BuilderInterface
     public const KEY_EXPOSE_DB_PORT = 'expose-db-port';
     public const KEY_NO_TMP_MOUNTS = 'no-tmp-mounts';
     public const KEY_WITH_SELENIUM = 'with-selenium';
+    public const KEY_SYNC_ENGINE = 'sync-engine';
 
     public const SERVICE_GENERIC = 'generic';
     public const SERVICE_DB = 'db';
@@ -54,6 +55,9 @@ interface BuilderInterface
     public const VOLUME_MAGENTO_DB = 'magento-db';
     public const VOLUME_MAGENTO_DEV = 'magento-dev';
     public const VOLUME_DOCKER_MNT = 'docker-mnt';
+    public const VOLUME_DOCKER_ETRYPOINT = 'docker-entrypoint';
+
+    public const SYNC_ENGINE_NATIVE = 'native';
 
     /**
      * @param Repository $config

src/Compose/DeveloperBuilder.php

@@ -8,6 +8,7 @@
 namespace Magento\CloudDocker\Compose;
 
 use Illuminate\Contracts\Config\Repository;
+use Magento\CloudDocker\Compose\ProductionBuilder\VolumeResolver;
 use Magento\CloudDocker\Filesystem\FileList;
 
 /**
@@ -19,9 +20,7 @@ class DeveloperBuilder implements BuilderInterface
 {
     public const SYNC_ENGINE_DOCKER_SYNC = 'docker-sync';
     public const SYNC_ENGINE_MUTAGEN = 'mutagen';
-    public const SYNC_ENGINE_NATIVE = 'native';
-
-    public const KEY_SYNC_ENGINE = 'sync-engine';
+    public const DEFAULT_SYNC_ENGINE = self::SYNC_ENGINE_NATIVE;
 
     public const VOLUME_MAGENTO_SYNC = 'magento-sync';
 
@@ -46,16 +45,27 @@ class DeveloperBuilder implements BuilderInterface
      */
     private $resolver;
 
+    /**
+     * @var VolumeResolver
+     */
+    private $volumeResolver;
+
     /**
      * @param BuilderFactory $builderFactory
      * @param FileList $fileList
      * @param Resolver $resolver
+     * @param VolumeResolver $volumeResolver
      */
-    public function __construct(BuilderFactory $builderFactory, FileList $fileList, Resolver $resolver)
-    {
+    public function __construct(
+        BuilderFactory $builderFactory,
+        FileList $fileList,
+        Resolver $resolver,
+        VolumeResolver $volumeResolver
+    ) {
         $this->builderFactory = $builderFactory;
         $this->fileList = $fileList;
         $this->resolver = $resolver;
+        $this->volumeResolver = $volumeResolver;
     }
 
     /**
@@ -86,7 +96,14 @@ public function build(Repository $config): Manager
 
         $manager->setVolumes([
             self::VOLUME_MAGENTO_SYNC => $syncConfig,
-            self::VOLUME_MAGENTO_DB => []
+            self::VOLUME_MAGENTO_DB => [],
+            self::VOLUME_DOCKER_ETRYPOINT => [
+                'driver_opts' => [
+                    'type' => 'none',
+                    'device' => $this->resolver->getRootPath('/.docker/mysql/docker-entrypoint-initdb.d'),
+                    'o' => 'bind'
+                ]
+            ]
         ]);
 
         /**
@@ -112,10 +129,18 @@ public function build(Repository $config): Manager
                 $volumes,
                 [
                     self::VOLUME_MAGENTO_DB . ':/var/lib/mysql',
-                    '.docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
+                    self::VOLUME_DOCKER_ETRYPOINT . ':/docker-entrypoint-initdb.d'
                 ]
             )
         ]);
+        $manager->updateService(self::SERVICE_BUILD, [
+            'volumes' => array_merge(
+                $volumes,
+                $this->volumeResolver->normalize(
+                    $this->volumeResolver->getComposerVolumes()
+                )
+            )
+        ]);
 
         return $manager;
     }
@@ -140,7 +165,7 @@ private function getMagentoVolumes(Repository $config): array
         }
 
         return [
-            self::VOLUME_MAGENTO_SYNC . ':' . $target
+            self::VOLUME_MAGENTO_SYNC . ':' . $target . ':delegated',
         ];
     }
 }

src/Compose/Manager.php

@@ -58,7 +58,7 @@ public function addService(string $name, array $extConfig, array $networks, arra
 
         $this->services[$name] = [
             'config' => $config,
-            'depends_on' => $depends
+            'depends_on' => $depends,
         ];
     }