Merge pull request #16 from magento-commerce/imported-magento-magento-cloud-docker-296

[Imported] Fixed incorrect port

Author: shiftedreality

images/nginx/1.19/Dockerfile

@@ -5,7 +5,7 @@ ENV XDEBUG_HOST fpm_xdebug
 ENV FPM_HOST fpm
 ENV FPM_PORT 9000
 ENV UPSTREAM_HOST web
-ENV UPSTREAM_PORT 80
+ENV UPSTREAM_PORT 8080
 ENV MAGENTO_ROOT /app
 ENV MAGENTO_RUN_MODE production
 ENV MFTF_UTILS 0

src/Compose/ProductionBuilder/Service/Tls.php

@@ -62,7 +62,7 @@ public function getConfig(Config $config): array
                         'aliases' => [$config->getHost()]
                     ]
                 ],
-                'environment' => ['UPSTREAM_HOST' => $this->getBackendService($config)],
+                'environment' => $this->getBackendServiceUpstream($config),
                 'ports' => [
                     $config->getPort() . ':80',
                     $config->getTlsPort() . ':443'
@@ -100,4 +100,24 @@ private function getBackendService(Config $config): string
             ? BuilderInterface::SERVICE_VARNISH
             : BuilderInterface::SERVICE_WEB;
     }
+
+    /**
+     * @param Config $config
+     * @return string[]
+     * @throws ConfigurationMismatchException
+     */
+    private function getBackendServiceUpstream(Config $config): array
+    {
+        if ($config->hasServiceEnabled(ServiceInterface::SERVICE_VARNISH)) {
+            return [
+                'UPSTREAM_HOST=' . BuilderInterface::SERVICE_VARNISH,
+                'UPSTREAM_PORT=80'
+            ];
+        }
+
+        return [
+            'UPSTREAM_HOST=' . BuilderInterface::SERVICE_WEB,
+            'UPSTREAM_PORT=8080'
+        ];
+    }
 }

src/Test/Integration/_files/cloud_base/docker-compose.exp.yml

@@ -110,7 +110,8 @@ services:
         aliases:
           - magento2.docker
     environment:
-      UPSTREAM_HOST: varnish
+      - UPSTREAM_HOST=varnish
+      - UPSTREAM_PORT=80
     ports:
       - '80:80'
       - '443:443'

src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml

@@ -104,7 +104,8 @@ services:
         aliases:
           - magento2.docker
     environment:
-      UPSTREAM_HOST: varnish
+      - UPSTREAM_HOST=varnish
+      - UPSTREAM_PORT=80
     ports:
       - '80:80'
       - '4443:443'

src/Test/Integration/_files/cloud_base_test/docker-compose.exp.yml

@@ -104,7 +104,8 @@ services:
         aliases:
           - magento2.docker
     environment:
-      UPSTREAM_HOST: varnish
+      - UPSTREAM_HOST=varnish
+      - UPSTREAM_PORT=80
     ports:
       - '80:80'
       - '4443:443'

src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml

@@ -84,7 +84,8 @@ services:
         aliases:
           - magento2.test
     environment:
-      UPSTREAM_HOST: varnish
+      - UPSTREAM_HOST=varnish
+      - UPSTREAM_PORT=80
     ports:
       - '8080:80'
       - '443:443'

src/Test/Integration/_files/custom_cloud_custom_images/docker-compose.exp.yml

@@ -109,7 +109,8 @@ services:
         aliases:
           - magento2.test
     environment:
-      UPSTREAM_HOST: varnish
+      - UPSTREAM_HOST=varnish
+      - UPSTREAM_PORT=80
     ports:
       - '8080:80'
       - '443:443'