Merge pull request #130 from magento-commerce/develop

MCLOUD-12025 Cloud Tools Releas

Author: sivaram7

.github/.metadata.json

@@ -1,14 +1,14 @@
 {
-  "templateVersion": "0.1",
+  "templateVersion": "0.2",
   "product": {
     "name": "Magento Cloud Docker",
     "description": "The Magento Cloud Docker implementation deploys Cloud projects to a local workstation so that you can develop and test your code in a simulated Cloud environment"
   },
   "contacts": {
     "team": {
-      "name": "Magic Mountain",
-      "DL": "Grp-magento-cloud-all",
-      "slackChannel": "magic_mountain"
+      "name": "Mystic Mountain",
+      "DL": "Grp-Mystic-Mountain",
+      "slackChannel": "#mystic-mountain-team"
     }
   },
   "ticketTracker": {
@@ -17,10 +17,8 @@
     },
     "securityJiraQueue": {
       "projectKey": "MAGREQ",
-      "component": "Magento Cloud Engineering"
+      "component": "MAGREQ/Magento Cloud Engineering"
     }
   },
-  "staticScan": {
-    "enable": false
-  }
+  "productionCodeBranches": ["1.0", "1.1", "1.2", "1.3"]
 }

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-docker",
     "description": "Magento Cloud Docker",
     "type": "magento2-component",
-    "version": "1.3.6",
+    "version": "1.3.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -13,10 +13,10 @@
         "composer/composer": "^1.4 || ^2.0",
         "composer/semver": "@stable",
         "illuminate/config": "^5.5||^8.77",
-        "symfony/config": "^4.4 || ^5.1",
-        "symfony/console": "^2.8 || ^4.0 || ^5.1",
-        "symfony/dependency-injection": "^3.3 || ^4.3 || ^5.1",
-        "symfony/yaml": "^3.3 || ^4.0 || ^5.1"
+        "symfony/config": "^4.4 || ^5.1|| ^5.4 || ^6.4",
+        "symfony/console": "^2.8 || ^4.0 || ^5.1 || ^5.4 || ^6.4",
+        "symfony/dependency-injection": "^3.3 || ^4.3 || ^5.1|| ^5.4 || ^6.4",
+        "symfony/yaml": "^3.3 || ^4.0 || ^5.1 || ^5.4|| ^6.4"
     },
     "require-dev": {
         "codeception/codeception": "^4.1",
@@ -26,7 +26,7 @@
         "codeception/module-rest": "^1.2",
         "consolidation/robo": "^1.2 || ^2.0",
         "phpmd/phpmd": "@stable",
-        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan": "^1.8",
         "phpunit/phpunit": "^8.5 || ^9.5",
         "squizlabs/php_codesniffer": "^3.0"
     },

config/services.xml

@@ -9,6 +9,7 @@
         <prototype namespace="Magento\CloudDocker\" resource="../src/*" exclude="../src/{Test}"/>
         <service id="Magento\CloudDocker\App\Container" autowire="false"/>
         <service id="Magento\CloudDocker\App\ContainerInterface" alias="container"/>
+        <service id="Psr\Container\ContainerInterface" alias="service_container"/>
         <service id="Magento\CloudDocker\App\ContainerException" autowire="false"/>
         <service id="Magento\CloudDocker\Compose\BuilderFactory">
             <argument key="$strategies" type="collection">

images/nginx/1.19/Dockerfile images/nginx/1.24/Dockerfileimages/nginx/1.19/Dockerfile renamed to 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

images/nginx/1.19/docker-entrypoint.sh images/nginx/1.24/docker-entrypoint.shimages/nginx/1.19/docker-entrypoint.sh renamed to images/nginx/1.24/docker-entrypoint.sh

@@ -0,0 +1,21 @@
+FROM opensearchproject/opensearch:1.3.0
+
+USER root
+RUN yum -y install zip && \
+    zip -q -d /usr/share/opensearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
+    yum remove -y zip && \
+    yum -y clean all && \
+    rm -rf /var/cache
+USER opensearch
+
+RUN bin/opensearch-plugin install -b analysis-icu && \
+    bin/opensearch-plugin install -b analysis-phonetic
+
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+ADD docker-entrypoint.sh /docker-entrypoint.sh
+
+HEALTHCHECK --retries=3 CMD ["bash", "/docker-healthcheck.sh"]
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+EXPOSE 9200 9300

images/nginx/1.19/etc/nginx.conf images/nginx/1.24/etc/nginx.confimages/nginx/1.19/etc/nginx.conf renamed to images/nginx/1.24/etc/nginx.conf

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if [[ -n "$OS_PLUGINS" ]]; then
+  echo "Installing plugins: $OS_PLUGINS"
+  for PLUGIN in $OS_PLUGINS
+  do
+      ./bin/opensearch-plugin install -b "$PLUGIN"
+  done
+fi
+
+/bin/bash /usr/share/opensearch/opensearch-docker-entrypoint.sh