Merge develop into fix-blackfire PR branch

Author: IgorVitol-Epam

codeception.dist.yml

@@ -26,6 +26,7 @@ modules:
       composer_magento_password: "%REPO_PASSWORD%"
       composer_github_token: "%GITHUB_TOKEN%"
       use_generated_images: false
+      generated_images_namespace: "cloudft"
       use_cached_workdir: true
       version_generated_images: "%TRAVIS_BUILD_NUMBER%"
       printOutput: false

images/nginx/1.19/Dockerfile

@@ -10,6 +10,8 @@ ENV MAGENTO_ROOT /app
 ENV MAGENTO_RUN_MODE production
 ENV MFTF_UTILS 0
 ENV DEBUG false
+ENV NGINX_WORKER_PROCESSES 1
+ENV NGINX_WORKER_CONNECTIONS 1024
 
 COPY etc/nginx.conf /etc/nginx/
 COPY etc/vhost.conf /etc/nginx/conf.d/default.conf

images/nginx/1.19/docker-entrypoint.sh

@@ -18,6 +18,8 @@ XDEBUG_UPSTREAM_FILE="/etc/nginx/conf.d/xdebug/upstream.conf"
 [ ! -z "${UPLOAD_MAX_FILESIZE}" ] && sed -i "s/!UPLOAD_MAX_FILESIZE!/${UPLOAD_MAX_FILESIZE}/" $VHOST_FILE
 [ ! -z "${WITH_XDEBUG}" ] && sed -i "s/!WITH_XDEBUG!/${WITH_XDEBUG}/" $VHOST_FILE
 [ "${WITH_XDEBUG}" == "1" ] && sed -i "s/#include_xdebug_upstream/include/" $NGINX_FILE
+[ ! -z "${NGINX_WORKER_PROCESSES}" ] && sed -i "s/!NGINX_WORKER_PROCESSES!/${NGINX_WORKER_PROCESSES}/" $NGINX_FILE
+[ ! -z "${NGINX_WORKER_CONNECTIONS}" ] && sed -i "s/!NGINX_WORKER_CONNECTIONS!/${NGINX_WORKER_CONNECTIONS}/" $NGINX_FILE
 
 # Check if the nginx syntax is fine, then launch.
 nginx -t

images/nginx/1.19/etc/nginx.conf

@@ -1,12 +1,12 @@
-worker_processes 2;
+worker_processes !NGINX_WORKER_PROCESSES!;
 
 error_log /var/log/nginx/error.log debug;
 pid /var/run/nginx.pid;
 
 events {
   # this should be equal to value of "ulimit -n"
   # reference: https://www.digitalocean.com/community/tutorials/how-to-optimize-nginx-configuration
-  worker_connections 1048576;
+  worker_connections !NGINX_WORKER_CONNECTIONS!;
 }
 
 http {

src/Command/BuildCompose.php

@@ -186,6 +186,18 @@ protected function configure(): void
                 null,
                 InputOption::VALUE_NONE,
                 'Sets host.docker.internal for fpm_xdebug container to resolve debug issue for LINUX system'
+            )->addOption(
+                Source\CliSource::OPTION_NGINX_WORKER_PROCESSES,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The number of NGINX worker processes',
+                Source\BaseSource::DEFAULT_NGINX_WORKER_PROCESSES
+            )->addOption(
+                Source\CliSource::OPTION_NGINX_WORKER_CONNECTIONS,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The maximum number of connections that each worker process can handle simultaneously',
+                Source\BaseSource::DEFAULT_NGINX_WORKER_CONNECTIONS
             );
 
         $this->addOption(
@@ -266,6 +278,11 @@ protected function configure(): void
             null,
             InputOption::VALUE_REQUIRED,
             'Port'
+        )->addOption(
+            Source\CliSource::OPTION_NO_TLS,
+            null,
+            InputOption::VALUE_NONE,
+            'Disable TLS'
         )->addOption(
             Source\CliSource::OPTION_TLS_PORT,
             null,

src/Compose/ProductionBuilder.php

@@ -7,6 +7,8 @@
 
 namespace Magento\CloudDocker\Compose;
 
+use Magento\CloudDocker\App\ConfigurationMismatchException;
+use Magento\CloudDocker\Compose\ProductionBuilder\ServiceBuilderInterface;
 use Magento\CloudDocker\Compose\ProductionBuilder\ServicePool;
 use Magento\CloudDocker\Compose\ProductionBuilder\VolumeResolver;
 use Magento\CloudDocker\Config\Config;
@@ -35,7 +37,6 @@ class ProductionBuilder implements BuilderInterface
         self::SERVICE_GENERIC,
         self::SERVICE_DEPLOY,
         self::SERVICE_BUILD,
-        self::SERVICE_TLS,
         self::SERVICE_WEB,
         self::SERVICE_FPM,
         self::SERVICE_DB,
@@ -91,7 +92,7 @@ public function build(Config $config): Manager
         $manager = $this->managerFactory->create($config);
 
         foreach ($this->servicePool->getServices() as $service) {
-            if ($config->hasServiceEnabled($service->getServiceName())
+            if ($this->hasServiceEnabled($service, $config)
                 || in_array($service->getName(), self::$requiredServices)
             ) {
                 $manager->addService($service);
@@ -135,4 +136,24 @@ public function getPath(): string
     {
         return $this->fileList->getMagentoDockerCompose();
     }
+
+    /**
+     * Checks the availability of the service
+     *
+     * @param ServiceBuilderInterface $service
+     * @param Config $config
+     * @return bool
+     * @throws ConfigurationMismatchException
+     */
+    private function hasServiceEnabled(ServiceBuilderInterface $service, Config $config): bool
+    {
+        $serviceNames = [
+            BuilderInterface::SERVICE_FPM_XDEBUG,
+            BuilderInterface::SERVICE_DB_QUOTE,
+            BuilderInterface::SERVICE_DB_SALES,
+        ];
+        $service = in_array($service->getName(), $serviceNames) ? $service->getServiceName() : $service->getName();
+
+        return $config->hasServiceEnabled($service);
+    }
 }

src/Compose/ProductionBuilder/Service/Tls.php

@@ -62,7 +62,7 @@ public function getConfig(Config $config): array
                         'aliases' => [$config->getHost()]
                     ]
                 ],
-                'environment' => $this->getBackendServiceUpstream($config),
+                'environment' => $this->getEnvironmentVariables($config),
                 'ports' => [
                     $config->getPort() . ':80',
                     $config->getTlsPort() . ':443'
@@ -106,18 +106,23 @@ private function getBackendService(Config $config): string
      * @return string[]
      * @throws ConfigurationMismatchException
      */
-    private function getBackendServiceUpstream(Config $config): array
+    private function getEnvironmentVariables(Config $config): array
     {
+        $envVariables = [
+            'NGINX_WORKER_PROCESSES=' . $config->getNginxWorkerProcesses(),
+            'NGINX_WORKER_CONNECTIONS=' . $config->getNginxWorkerConnections(),
+        ];
+
         if ($config->hasServiceEnabled(ServiceInterface::SERVICE_VARNISH)) {
-            return [
-                'UPSTREAM_HOST=' . BuilderInterface::SERVICE_VARNISH,
-                'UPSTREAM_PORT=80'
-            ];
+            $envVariables[] = 'UPSTREAM_HOST=' . BuilderInterface::SERVICE_VARNISH;
+            $envVariables[] = 'UPSTREAM_PORT=80';
+
+            return $envVariables;
         }
 
-        return [
-            'UPSTREAM_HOST=' . BuilderInterface::SERVICE_WEB,
-            'UPSTREAM_PORT=8080'
-        ];
+        $envVariables[] = 'UPSTREAM_HOST=' . BuilderInterface::SERVICE_WEB;
+        $envVariables[] = 'UPSTREAM_PORT=8080';
+
+        return $envVariables;
     }
 }

src/Compose/ProductionBuilder/Service/Varnish.php

@@ -11,6 +11,7 @@
 use Magento\CloudDocker\Compose\ProductionBuilder\ServiceBuilderInterface;
 use Magento\CloudDocker\Config\Config;
 use Magento\CloudDocker\Service\ServiceFactory;
+use Magento\CloudDocker\Service\ServiceInterface;
 
 /**
  * Returns Varnish service configuration
@@ -51,13 +52,24 @@ public function getServiceName(): string
      */
     public function getConfig(Config $config): array
     {
-        return $this->serviceFactory->create(
+        $result = $this->serviceFactory->create(
             $this->getServiceName(),
             $config->getServiceVersion($this->getServiceName()),
             [],
             $config->getServiceImage($this->getServiceName()),
             $config->getServiceImagePattern($this->getServiceName())
         );
+
+        if (!$config->hasServiceEnabled(ServiceInterface::SERVICE_TLS)) {
+            $result['ports'] = [$config->getPort() . ':80'];
+            $result['networks'] = [
+                BuilderInterface::NETWORK_MAGENTO => [
+                    'aliases' => [$config->getHost()]
+                ]
+            ];
+        }
+
+        return $result;
     }
 
     /**

src/Compose/ProductionBuilder/Service/Web.php

@@ -60,18 +60,33 @@ public function getServiceName(): string
      */
     public function getConfig(Config $config): array
     {
-        return $this->serviceFactory->create(
+        $result = $this->serviceFactory->create(
             $this->getServiceName(),
             $config->getServiceVersion(ServiceInterface::SERVICE_NGINX),
             [
                 'volumes' => $this->volume->getRo($config),
                 'environment' => [
-                    'WITH_XDEBUG=' . (int)$config->hasServiceEnabled(ServiceInterface::SERVICE_FPM_XDEBUG)
-                ]
+                    'WITH_XDEBUG=' . (int)$config->hasServiceEnabled(ServiceInterface::SERVICE_FPM_XDEBUG),
+                    'NGINX_WORKER_PROCESSES=' . $config->getNginxWorkerProcesses(),
+                    'NGINX_WORKER_CONNECTIONS=' . $config->getNginxWorkerConnections(),
+                ],
             ],
             $config->getServiceImage(ServiceInterface::SERVICE_NGINX),
             $config->getServiceImagePattern(ServiceInterface::SERVICE_NGINX)
         );
+
+        if (!$config->hasServiceEnabled(ServiceInterface::SERVICE_TLS)
+            && !$config->hasServiceEnabled(ServiceInterface::SERVICE_VARNISH)
+        ) {
+            $result['ports'] = [$config->getPort() . ':8080'];
+            $result['networks'] = [
+                BuilderInterface::NETWORK_MAGENTO => [
+                    'aliases' => [$config->getHost()]
+                ]
+            ];
+        }
+
+        return $result;
     }
 
     /**

src/Config/Config.php

@@ -467,4 +467,28 @@ public function getMailHogHttpPort(): ?string
     {
         return $this->all()->get(SourceInterface::SYSTEM_MAILHOG_HTTP_PORT);
     }
+
+    /**
+     * Returns the value of the `worker_processes` parameter of the Nginx service
+     *
+     * @return string
+     * @throws ConfigurationMismatchException
+     */
+    public function getNginxWorkerProcesses(): string
+    {
+        $value = $this->all()->get(SourceInterface::SYSTEM_NGINX_WORKER_PROCESSES);
+        if (SourceInterface::NGINX_WORKER_PROCESSES_AUTO === $value) {
+            return $value;
+        }
+        return (string)$value;
+    }
+
+    /**
+     * @return int
+     * @throws ConfigurationMismatchException
+     */
+    public function getNginxWorkerConnections()
+    {
+        return (int)$this->all()->get(SourceInterface::SYSTEM_NGINX_WORKER_CONNECTIONS);
+    }
 }