Merge pull request #119 from magento-commerce/MCLOUD-10948

BaDos · web-flow · commit e1ea19368b03 · 2023-10-20T11:24:54.000-05:00
MCLOUD-10948: Add nginx 1.24
diff --git a/images/nginx/1.24/Dockerfile b/images/nginx/1.24/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.19
+FROM nginx:1.24
 
 ENV UPLOAD_MAX_FILESIZE 64M
 ENV XDEBUG_HOST fpm_xdebug
diff --git a/images/nginx/1.24/docker-entrypoint.sh b/images/nginx/1.24/docker-entrypoint.sh
diff --git a/images/nginx/1.24/etc/nginx.conf b/images/nginx/1.24/etc/nginx.conf
diff --git a/images/nginx/1.24/etc/vhost.conf b/images/nginx/1.24/etc/vhost.conf
diff --git a/images/nginx/1.24/etc/xdebug-upstream.conf b/images/nginx/1.24/etc/xdebug-upstream.conf
diff --git a/src/Service/ServiceFactory.php b/src/Service/ServiceFactory.php
@@ -42,7 +42,7 @@ class ServiceFactory
      */
     private const SERVICE_NGINX_CONFIG = [
         'image' => 'magento/magento-cloud-docker-nginx',
-        'version' => '1.19',
+        'version' => '1.24',
         'pattern' => self::PATTERN_VERSIONED,
         'config' => [
             'extends' => ServiceInterface::SERVICE_GENERIC,
diff --git a/src/Test/Functional/Acceptance/Services72Cest.php b/src/Test/Functional/Acceptance/Services72Cest.php
@@ -28,7 +28,7 @@ protected function servicesDataProvider(): array
                 'expectedResult' => [
                     'redis:5.0',
                     'magento/magento-cloud-docker-varnish:6.6-1.3',
-                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-nginx:1.24-1.3',
                     'magento/magento-cloud-docker-php:7.2-fpm-1.3',
                     'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2'
@@ -40,7 +40,7 @@ protected function servicesDataProvider(): array
                 'expectedResult' => [
                     'redis:3.2',
                     'magento/magento-cloud-docker-varnish:6.6-1.3',
-                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-nginx:1.24-1.3',
                     'magento/magento-cloud-docker-php:7.4-fpm-1.3',
                     'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.1',
@@ -53,7 +53,7 @@ protected function servicesDataProvider(): array
                 'expectedResult' => [
                     'redis:4.0',
                     'magento/magento-cloud-docker-varnish:6.6-1.3',
-                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-nginx:1.24-1.3',
                     'magento/magento-cloud-docker-php:7.2-fpm-1.3',
                     'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2',
@@ -66,7 +66,7 @@ protected function servicesDataProvider(): array
                 'expectedResult' => [
                     'redis:5.0',
                     'magento/magento-cloud-docker-varnish:6.6-1.3',
-                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-nginx:1.24-1.3',
                     'magento/magento-cloud-docker-php:7.2-fpm-1.3',
                     'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2',
diff --git a/src/Test/Functional/Acceptance/ServicesCest.php b/src/Test/Functional/Acceptance/ServicesCest.php
@@ -92,7 +92,7 @@ protected function servicesDataProvider(): array
                 'expectedResult' => [
                     'redis:5.0',
                     'magento/magento-cloud-docker-varnish:6.6-1.3',
-                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-nginx:1.24-1.3',
                     'magento/magento-cloud-docker-php:7.3-fpm-1.3',
                     'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2'
@@ -104,7 +104,7 @@ protected function servicesDataProvider(): array
                 'expectedResult' => [
                     'redis:3.2',
                     'magento/magento-cloud-docker-varnish:6.6-1.3',
-                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-nginx:1.24-1.3',
                     'magento/magento-cloud-docker-php:7.2-fpm-1.3',
                     'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.1',
@@ -117,7 +117,7 @@ protected function servicesDataProvider(): array
                 'expectedResult' => [
                     'redis:4.0',
                     'magento/magento-cloud-docker-varnish:6.6-1.3',
-                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-nginx:1.24-1.3',
                     'magento/magento-cloud-docker-php:7.4-fpm-1.3',
                     'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2',
@@ -130,7 +130,7 @@ protected function servicesDataProvider(): array
                 'expectedResult' => [
                     'redis:5.0',
                     'magento/magento-cloud-docker-varnish:6.6-1.3',
-                    'magento/magento-cloud-docker-nginx:1.19-1.3',
+                    'magento/magento-cloud-docker-nginx:1.24-1.3',
                     'magento/magento-cloud-docker-php:7.3-fpm-1.3',
                     'magento/magento-cloud-docker-elasticsearch:6.5-1.3',
                     'mariadb:10.2',
diff --git a/src/Test/Integration/BuildCustomComposeTest.php b/src/Test/Integration/BuildCustomComposeTest.php
@@ -248,7 +248,7 @@ public function buildDataProvider(): array
                                 ],
                                 'nginx' => [
                                     'image' => 'nginx-v1',
-                                    'version' => '1.19',
+                                    'version' => '1.24',
                                     'image-pattern' => '%s:%s',
                                     'enabled' => 'true',
                                 ],
diff --git a/src/Test/Integration/_files/cloud_base/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base/docker-compose.exp.yml
@@ -103,7 +103,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -137,7 +137,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/cloud_base_developer/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_developer/docker-compose.exp.yml
@@ -96,7 +96,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:delegated'
@@ -123,7 +123,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/cloud_base_developer_manual/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_developer_manual/docker-compose.exp.yml
@@ -76,7 +76,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - 'magento-app:/app'
@@ -103,7 +103,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml
@@ -72,7 +72,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - './magento2ce:/app:ro,delegated'
@@ -107,7 +107,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/cloud_base_os_2.3_cli/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_os_2.3_cli/docker-compose.exp.yml
@@ -103,7 +103,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -137,7 +137,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/cloud_base_os_2_cli/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_os_2_cli/docker-compose.exp.yml
@@ -103,7 +103,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -137,7 +137,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/cloud_base_test/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_test/docker-compose.exp.yml
@@ -72,7 +72,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -107,7 +107,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_image/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_image/docker-compose.exp.yml
@@ -82,7 +82,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -116,7 +116,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_image_and_version/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_image_and_version/docker-compose.exp.yml
@@ -82,7 +82,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -116,7 +116,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_version/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_version/docker-compose.exp.yml
@@ -82,7 +82,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -116,7 +116,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/cloud_no_tls_service/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_no_tls_service/docker-compose.exp.yml
@@ -83,7 +83,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
diff --git a/src/Test/Integration/_files/cloud_no_varnish_and_tls_service/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_no_varnish_and_tls_service/docker-compose.exp.yml
@@ -83,7 +83,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
diff --git a/src/Test/Integration/_files/cloud_no_varnish_service/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_no_varnish_service/docker-compose.exp.yml
@@ -83,7 +83,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -107,7 +107,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml
@@ -46,7 +46,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.test
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -80,7 +80,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.test
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/custom_cloud_base_native/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_base_native/docker-compose.exp.yml
@@ -46,7 +46,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.test
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -80,7 +80,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.test
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/custom_cloud_custom_images/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_custom_images/docker-compose.exp.yml
@@ -84,7 +84,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.test
-    image: 'nginx-v1:1.19'
+    image: 'nginx-v1:1.24'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -119,7 +119,7 @@ services:
         condition: service_started
   tls:
     hostname: tls.magento2.test
-    image: 'nginx-v1:1.19'
+    image: 'nginx-v1:1.24'
     extends: generic
     networks:
       magento:
diff --git a/src/Test/Integration/_files/custom_cloud_no_tls_service/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_no_tls_service/docker-compose.exp.yml
@@ -41,7 +41,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
diff --git a/src/Test/Integration/_files/custom_cloud_no_varnish_and_tls_services/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_no_varnish_and_tls_services/docker-compose.exp.yml
@@ -41,7 +41,7 @@ services:
         condition: service_healthy
   web:
     hostname: web.magento2.docker
-    image: 'magento/magento-cloud-docker-nginx:1.19-1.2.0'
+    image: 'magento/magento-cloud-docker-nginx:1.24-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
diff --git a/src/Test/Integration/_files/custom_cloud_no_varnish_service/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_no_varnish_service/docker-compose.exp.yml
diff --git a/src/Test/Integration/_files/custom_registry/docker-compose.exp.yml b/src/Test/Integration/_files/custom_registry/docker-compose.exp.yml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nginx:1.19`
	`1`	`+FROM nginx:1.24`
`2`	`2`
`3`	`3`	`ENV UPLOAD_MAX_FILESIZE 64M`
`4`	`4`	`ENV XDEBUG_HOST fpm_xdebug`