Merge pull request #147 from magento/MAGECLOUD-5215

MAGECLOUD-5215: Forward-port delivered changes

Author: shiftedreality

src/Command/BuildCompose.php

@@ -50,7 +50,7 @@ class BuildCompose extends Command
     private const OPTION_NODE = 'node';
     private const OPTION_MODE = 'mode';
     private const OPTION_SYNC_ENGINE = 'sync-engine';
-    private const OPTION_NO_CRON = 'no-cron';
+    private const OPTION_WITH_CRON = 'with-cron';
     private const OPTION_NO_VARNISH = 'no-varnish';
     private const OPTION_WITH_SELENIUM = 'with-selenium';
 
@@ -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,
     ];
 
     /**
@@ -221,10 +221,10 @@ protected function configure(): void
                 )
             )
             ->addOption(
-                self::OPTION_NO_CRON,
+                self::OPTION_WITH_CRON,
                 null,
                 InputOption::VALUE_NONE,
-                'Remove cron container'
+                'Add cron container'
             )
             ->addOption(
                 self::OPTION_NO_VARNISH,
@@ -278,7 +278,7 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         $config->set([
             DeveloperBuilder::KEY_SYNC_ENGINE => $syncEngine,
-            ProductionBuilder::KEY_NO_CRON => $input->getOption(self::OPTION_NO_CRON),
+            ProductionBuilder::KEY_WITH_CRON=> $input->getOption(self::OPTION_WITH_CRON),
             ProductionBuilder::KEY_NO_VARNISH => $input->getOption(self::OPTION_NO_VARNISH),
             ProductionBuilder::KEY_WITH_SELENIUM => $input->getOption(self::OPTION_WITH_SELENIUM)
         ]);

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

@@ -386,7 +386,7 @@ public function build(Repository $config): Manager
             self::$cliDepends
         );
 
-        if (!$config->get(self::KEY_NO_CRON, false)) {
+        if ($config->get(self::KEY_WITH_CRON, false)) {
             $manager->addService(
                 self::SERVICE_CRON,
                 array_merge(