MAGECLOUD-5215: Forward-port delivered changes

Author: shiftedreality

src/Command/BuildCompose.php

@@ -69,7 +69,7 @@ class BuildCompose extends Command
         self::OPTION_RABBIT_MQ => ServiceInterface::NAME_RABBITMQ,
         self::OPTION_EXPOSE_DB_PORT => ProductionBuilder::KEY_EXPOSE_DB_PORT,
         self::OPTION_SELENIUM_VERSION => ServiceFactory::SERVICE_SELENIUM_VERSION,
-        self::OPTION_SELENIUM_IMAGE => ServiceFactory::SERVICE_SELENIUM_IMAGE
+        self::OPTION_SELENIUM_IMAGE => ServiceFactory::SERVICE_SELENIUM_IMAGE,
     ];
 
     /**
@@ -220,6 +220,12 @@ protected function configure(): void
                     ))
                 )
             )
+            ->addOption(
+                self::OPTION_WITH_CRON,
+                null,
+                InputOption::VALUE_NONE,
+                'Add cron container'
+            )
             ->addOption(
                 self::OPTION_NO_VARNISH,
                 null,

src/Compose/BuilderInterface.php

@@ -19,12 +19,12 @@ interface BuilderInterface
     public const DEFAULT_VARNISH_VERSION = 'latest';
     public const DEFAULT_TLS_VERSION = 'latest';
 
-    public const KEY_NO_CRON = 'no-cron';
     public const KEY_NO_VARNISH = 'no-varnish';
     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 KEY_WITH_CRON = 'with-cron';
 
     public const SERVICE_GENERIC = 'generic';
     public const SERVICE_DB = 'db';

src/Compose/ProductionBuilder.php

@@ -37,10 +37,6 @@ class ProductionBuilder implements BuilderInterface
     public const SYNC_ENGINE_MOUNT = 'mount';
     public const DEFAULT_SYNC_ENGINE = self::SYNC_ENGINE_MOUNT;
 
-    public const KEY_WITH_CRON = 'with-cron';
-    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';
     /**
      * @var array
      */
@@ -390,12 +386,15 @@ public function build(Repository $config): Manager
             self::$cliDepends
         );
 
-        if ($this->config->get(self::KEY_WITH_CRON, false)) {
-            $services['cron'] = $this->getCronCliService(
-                $phpVersion,
-                true,
-                $cliDepends,
-                'cron.magento2.docker'
+        if ($config->get(self::KEY_WITH_CRON, false)) {
+            $manager->addService(
+                self::SERVICE_CRON,
+                array_merge(
+                    $this->getCronCliService($phpVersion),
+                    ['volumes' => $volumesRo]
+                ),
+                [self::NETWORK_MAGENTO],
+                self::$cliDepends
             );
         }