Release 47.0.0 (#1138)

Co-authored-by: Michael Lehmkuhl <michael@electricpulp.com> Co-authored-by: Jenyamba <is3kv3@ukr.net> Co-authored-by: Tu Van <vandinhtuit@gmail.com> Co-authored-by: Cid Lopes <alannettto@gmail.com>
markshust · Apr 25, 2024 · 079c79e · 079c79e
1 parent 4dd2e62
commit 079c79e
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [47.0.0] - 2024-04-25
+
+### Added
+- Check to ensure directory does not already exist in project directory [PR #1127](https://github.com/markshust/docker-magento/pull/1127).
+
+### Updated
+- Remove obsolete version directive from docker compose files [PR #1125](https://github.com/markshust/docker-magento/pull/1125).
+- Predefined version from 2.4.6-p4 to 2.4.7 [PR #1128](https://github.com/markshust/docker-magento/pull/1128).
+- Integration testing configuration to use OpenSearch [PR #1131](https://github.com/markshust/docker-magento/pull/1131).
+
+### Fixed
+- SSL cert generation when domain has a port included [PR #1136](https://github.com/markshust/docker-magento/pull/1136).
+- OpenSearch container fails to start due to memory heap size configuration [PR #1137](https://github.com/markshust/docker-magento/pull/1137).
+
 ## [46.1.1] - 2024-04-16
 
 ### Fixed

diff --git a/compose/bin/download b/compose/bin/download
@@ -10,6 +10,11 @@ NC='\033[0m' # No Color
 
 bin/stop
 
+if [ -d "./bin" ]; then
+  echo "Error: The current directory is not empty. Please remove all contents within this directory and try again."
+  exit 1
+fi
+
 bin/start --no-dev
 [ $? != 0 ] && echo "Failed to start Docker services" && exit
 

diff --git a/compose/bin/setup-ssl b/compose/bin/setup-ssl
@@ -7,7 +7,8 @@ if ! bin/docker-compose exec -T -u root app cat /root/.local/share/mkcert/rootCA
 fi
 
 # Generate the certificate for the specified domain
-bin/docker-compose exec -T -u root app mkcert -key-file nginx.key -cert-file nginx.crt "$@"
+DOMAIN_WITHOUT_PORT=$(echo "$@" | cut -d ':' -f1)
+bin/docker-compose exec -T -u root app mkcert -key-file nginx.key -cert-file nginx.crt "$DOMAIN_WITHOUT_PORT"
 echo "Moving key and cert to /etc/nginx/certs/..."
 bin/docker-compose exec -T -u root app chown app:app nginx.key nginx.crt
 bin/docker-compose exec -T -u root app mv nginx.key nginx.crt /etc/nginx/certs/

diff --git a/compose/compose.dev-linux.yaml b/compose/compose.dev-linux.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   app:
     volumes: &appvolumes

diff --git a/compose/compose.dev-ssh.yaml b/compose/compose.dev-ssh.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   app:
     volumes: &appvolumes

diff --git a/compose/compose.dev.yaml b/compose/compose.dev.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   app:
     volumes: &appvolumes

diff --git a/compose/compose.healthcheck.yaml b/compose/compose.healthcheck.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   app:
     healthcheck:

diff --git a/compose/compose.yaml b/compose/compose.yaml
@@ -1,7 +1,7 @@
 ## Mark Shust's Docker Configuration for Magento
 ## (https://github.com/markshust/docker-magento)
 ##
-## Version 46.1.1
+## Version 47.0.0
 
 ## To use SSH, see https://github.com/markshust/docker-magento#ssh
 ## Linux users, see https://github.com/markshust/docker-magento#linux
@@ -10,8 +10,6 @@
 ## 172.17.0.1 in this file with the result of:
 ## docker network inspect bridge --format='{{(index .IPAM.Config 0).Gateway}}'
 
-version: "3"
-
 services:
   app:
     image: markoshust/magento-nginx:1.24-0
@@ -80,8 +78,10 @@ services:
       ## More info at https://github.com/markshust/docker-magento/issues/488
       - "cluster.routing.allocation.disk.threshold_enabled=false"
       - "index.blocks.read_only_allow_delete"
-      ## Uncomment the following line to increase the virtual memory map count
-  #   - "max_map_count=262144"
+      ## Uncomment to set custom heap size to avoid memory errors
+      #- "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
+      ## Uncomment to increase the virtual memory map count
+      #- "max_map_count=262144"
 
   ## If you wish to use Elasticsearch, comment out opensearch image above and
   ## uncomment this block. Do the same in the composer.healthcheck.yaml file.
@@ -100,8 +100,10 @@ services:
   #    ## More info at https://github.com/markshust/docker-magento/issues/488
   #    - "cluster.routing.allocation.disk.threshold_enabled=false"
   #    - "index.blocks.read_only_allow_delete"
-  #    ## Uncomment the following line to increase the virtual memory map count
-  #    - "max_map_count=262144"
+  #    ## Uncomment to set custom heap size to avoid memory errors
+  #    #- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
+  #    ## Uncomment to increase the virtual memory map count
+  #    #- "max_map_count=262144"
 
   rabbitmq:
     image: markoshust/magento-rabbitmq:3.12-0
@@ -116,14 +118,14 @@ services:
     image: sj26/mailcatcher
     ports:
       - "1080:1080"
-  
+
   ## Cloudflare tunnel support, uncomment to enable
   #tunnel:
   #  container_name: cloudflared-tunnel
   #  image: cloudflare/cloudflared:latest
   #  command: tunnel run
   #  env_file: env/cloudflare.env
-  
+
   ## Blackfire support, uncomment to enable
   #blackfire:
   #  image: blackfire/blackfire:2

diff --git a/compose/env/elasticsearch.env b/compose/env/elasticsearch.env
@@ -1,5 +1,2 @@
 ES_HOST=elasticsearch
 ES_PORT=9200
-
-## Set custom heap size to avoid memory errors
-ES_JAVA_OPTS="-Xms1g -Xmx1g"
diff --git a/compose/env/opensearch.env b/compose/env/opensearch.env
@@ -1,9 +1,5 @@
 OPENSEARCH_HOST=opensearch
 OPENSEARCH_PORT=9200
-OPENSEARCH_HEALTHCHECK_TIMEOUT=100
-
-## Set custom heap size to avoid memory errors
-OPENSEARCH_JAVA_OPTS="-Xms1g -Xmx1g"
 
 # Prevent security patch conflicts with core M2 code
 DISABLE_SECURITY_PLUGIN=true
diff --git a/compose/template/dev/tests/integration/etc/install-config-mysql.php.2.4.dist b/compose/template/dev/tests/integration/etc/install-config-mysql.php.2.4.dist
@@ -3,15 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 return [
     'db-host' => 'db',
     'db-user' => 'magento',
     'db-password' => 'magento',
     'db-name' => 'magento_integration_tests',
     'db-prefix' => '',
     'backend-frontname' => 'backend',
-    'search-engine' => 'elasticsearch7',
-    'elasticsearch-host' => 'elasticsearch',
+    'search-engine' => 'opensearch',
+    'opensearch-host' => 'opensearch',
     'admin-user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
     'admin-password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
     'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
@@ -21,4 +22,5 @@ return [
     'amqp-port' => '5672',
     'amqp-user' => 'magento',
     'amqp-password' => 'magento',
+    'consumers-wait-for-messages' => '0',
 ];
diff --git a/lib/template b/lib/template
@@ -3,6 +3,12 @@ git init -qqq
 git remote add origin https://github.com/markshust/docker-magento
 git fetch origin -qqq
 git checkout origin/master -- compose
+
+if [ -d "./bin" ]; then
+  echo "Error: The current directory is not empty. Please remove all contents within this directory and try again."
+  exit 1
+fi
+
 mv compose/* ./
 mv compose/.gitignore ./
 mv compose/.vscode ./