MAGECLOUD-2886: [Cloud Docker] Add Redis 3.2 and 4.0 (#376)

Author: oshmyheliuk

src/Command/Docker/Build.php

@@ -27,6 +27,7 @@ class Build extends Command
     const OPTION_PHP = 'php';
     const OPTION_NGINX = 'nginx';
     const OPTION_DB = 'db';
+    const OPTION_REDIS = 'redis';
     const OPTION_ES = 'es';
     const OPTION_RABBIT_MQ = 'rmq';
 
@@ -97,6 +98,12 @@ protected function configure()
                 InputOption::VALUE_OPTIONAL,
                 'DB version',
                 BuilderInterface::DEFAULT_DB_VERSION
+            )->addOption(
+                self::OPTION_REDIS,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Redis version',
+                BuilderInterface::DEFAULT_REDIS_VERSION
             )->addOption(
                 self::OPTION_ES,
                 null,
@@ -151,6 +158,10 @@ public function execute(InputInterface $input, OutputInterface $output)
             $builder->setDbVersion($dbVersion);
         }
 
+        if ($redisVersion = $input->getOption(self::OPTION_REDIS)) {
+            $builder->setRedisVersion($redisVersion);
+        }
+
         if ($esVersion = $input->getOption(self::OPTION_ES)) {
             $builder->setESVersion($esVersion);
         }

src/Docker/BuilderInterface.php

@@ -18,13 +18,16 @@ interface BuilderInterface
 
     const RABBIT_MQ_VERSIONS = ['3.5', '3.7'];
     const DEFAULT_RABBIT_MQ_VERSION = '3.5';
+    const REDIS_VERSIONS = ['3.2', '4.0'];
 
     const DEFAULT_NGINX_VERSION = 'latest';
     const DEFAULT_DB_VERSION = '10';
+    const DEFAULT_REDIS_VERSION = '3.2';
 
     const PHP_VERSION = 'php.version';
     const NGINX_VERSION = 'nginx.version';
     const DB_VERSION = 'db.version';
+    const REDIS_VERSION = 'redis.version';
     const ES_VERSION = 'es.version';
     const RABBIT_MQ_VERSION = 'rmq.version';
 
@@ -51,6 +54,12 @@ public function setNginxVersion(string $version);
      */
     public function setDbVersion(string $version);
 
+    /**
+     * @param string $version
+     * @throws ConfigurationMismatchException
+     */
+    public function setRedisVersion(string $version);
+
     /**
      * @param string $version
      * @throws ConfigurationMismatchException

src/Docker/DevBuilder.php

@@ -63,6 +63,14 @@ public function setDbVersion(string $version)
         ]);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function setRedisVersion(string $version)
+    {
+        $this->setVersion(self::REDIS_VERSION, $version, self::REDIS_VERSIONS);
+    }
+
     /**
      * @inheritdoc
      */
@@ -110,7 +118,7 @@ public function build(): array
             'version' => '2',
             'services' => [
                 'varnish' => $this->serviceFactory->create(ServiceFactory::SERVICE_VARNISH)->get(),
-                'redis' => $this->serviceFactory->create(ServiceFactory::SERVICE_REDIS)->get(),
+                'redis' => $this->getRedisService(),
                 'elasticsearch' => $this->getElasticSearchService(),
                 'rabbitmq' => $this->getRabbitMQService(),
                 'fpm' => $this->getFpmService(),
@@ -160,6 +168,24 @@ private function getRabbitMQService(): array
         ];
     }
 
+    /**
+     * @return array
+     */
+    private function getRedisService(): array
+    {
+        $version = $this->config->get(self::REDIS_VERSION, self::DEFAULT_REDIS_VERSION);
+
+        return [
+            'image' => 'redis:' . $version,
+            'volumes' => [
+                '/data',
+            ],
+            'ports' => [
+                6379,
+            ],
+        ];
+    }
+
     /**
      * @param bool $isReadOnly
      * @return string

src/Docker/IntegrationBuilder.php

@@ -60,6 +60,17 @@ public function setDbVersion(string $version)
         ]);
     }
 
+    /**
+     * @param string $version
+     * @throws ConfigurationMismatchException
+     */
+    public function setRedisVersion(string $version)
+    {
+        $this->setVersion(self::REDIS_VERSION, $version, [
+            self::DEFAULT_REDIS_VERSION,
+        ]);
+    }
+
     /**
      * @inheritdoc
      */

src/Docker/Service/RedisService.php

@@ -13,15 +13,13 @@
 class ServiceFactory
 {
     const SERVICE_VARNISH = 'varnish';
-    const SERVICE_REDIS = 'redis';
     const SERVICE_RABBITMQ = 'rabbitmq';
 
     /**
      * @var array
      */
     private static $map = [
         self::SERVICE_VARNISH => VarnishService::class,
-        self::SERVICE_REDIS => RedisService::class,
         self::SERVICE_RABBITMQ => RabbitMqService::class,
     ];
 

src/Docker/Service/ServiceFactory.php

@@ -139,6 +139,7 @@ public function testExecuteWithParams()
                 [Build::OPTION_PHP, '7.1'],
                 [Build::OPTION_DB, '10'],
                 [Build::OPTION_NGINX, '1.9'],
+                [Build::OPTION_REDIS, '3.2'],
                 [Build::OPTION_ES, '2.4'],
                 [Build::OPTION_RABBIT_MQ, '3.5'],
                 [Build::OPTION_IS_TEST, false],
@@ -149,6 +150,9 @@ public function testExecuteWithParams()
         $this->builderMock->expects($this->once())
             ->method('setNginxVersion')
             ->with('1.9');
+        $this->builderMock->expects($this->once())
+            ->method('setRedisVersion')
+            ->with('3.2');
         $this->builderMock->expects($this->once())
             ->method('setDbVersion')
             ->with('10');