From 5d9292392eb34f9017b0879824ffe5a6478301b9 Mon Sep 17 00:00:00 2001 From: Michael Lehmkuhl Date: Wed, 17 Apr 2024 11:44:52 -0500 Subject: [PATCH 1/9] Removes obsolete `version` directive from docker compose files (#1125) --- compose/compose.dev-linux.yaml | 2 -- compose/compose.dev-ssh.yaml | 2 -- compose/compose.dev.yaml | 2 -- compose/compose.healthcheck.yaml | 2 -- compose/compose.yaml | 6 ++---- 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/compose/compose.dev-linux.yaml b/compose/compose.dev-linux.yaml index 8df350fa0..fae7d78cb 100644 --- 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 index 6744b8a54..c05c72234 100644 --- 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 index 44d2d5114..641fc7b56 100644 --- 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 index e18245944..b53891ca7 100644 --- 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 index 2059562e9..834d0477d 100644 --- a/compose/compose.yaml +++ b/compose/compose.yaml @@ -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 @@ -116,14 +114,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 From 865f7e0f11547c14985f3f291f66853da97f597f Mon Sep 17 00:00:00 2001 From: Jenyamba Date: Thu, 18 Apr 2024 00:01:27 +0300 Subject: [PATCH 2/9] Update predefined version from 2.4.6-p4 to 2.4.7 (#1128) --- lib/onelinesetup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/onelinesetup b/lib/onelinesetup index d802f4593..62b5fbdaa 100755 --- a/lib/onelinesetup +++ b/lib/onelinesetup @@ -2,7 +2,7 @@ set -o errexit DOMAIN=${1:-magento.test} -VERSION=${2:-2.4.6-p4} +VERSION=${2:-2.4.7} EDITION=${3:-community} curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash From ed401d39a48583c37ca389824a0fb6c359e17078 Mon Sep 17 00:00:00 2001 From: Jenyamba Date: Thu, 18 Apr 2024 00:06:30 +0300 Subject: [PATCH 3/9] Adds a check to ensure that the directory does not already exist in the project directory (#1127) Co-authored-by: Mark Shust --- compose/bin/download | 5 +++++ lib/template | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/compose/bin/download b/compose/bin/download index 452fcba85..9ae09b959 100755 --- 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/lib/template b/lib/template index 3ef44a660..8f3a4833e 100755 --- 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 ./ From eb69d509221b8938071c069433f91528be46eeef Mon Sep 17 00:00:00 2001 From: Tu Van Date: Fri, 19 Apr 2024 03:20:09 +0700 Subject: [PATCH 4/9] Update Integration testing configuration to use OpenSearch (#1131) --- .../tests/integration/etc/install-config-mysql.php.2.4.dist | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 index 68acd8359..29ae77348 100644 --- 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,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + return [ 'db-host' => 'db', 'db-user' => 'magento', @@ -10,8 +11,8 @@ return [ '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', ]; From 016e1429d18ac8bc8bbd61d3034e48886594b556 Mon Sep 17 00:00:00 2001 From: Cid Lopes Date: Wed, 24 Apr 2024 19:29:42 +0300 Subject: [PATCH 5/9] Fix SSL cert generation when domain has a port included (#1136) --- compose/bin/setup-ssl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compose/bin/setup-ssl b/compose/bin/setup-ssl index 405552735..9d8f29e3c 100755 --- 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/ From aa7297c64899757d6944a90ed743e02d1fbb3c92 Mon Sep 17 00:00:00 2001 From: Mark Shust Date: Thu, 25 Apr 2024 12:09:24 -0400 Subject: [PATCH 6/9] =?UTF-8?q?OpenSearch=20container=20fails=20to=20start?= =?UTF-8?q?=20due=20to=20memory=20heap=20size=20configura=E2=80=A6=20(#113?= =?UTF-8?q?7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compose/compose.yaml | 12 ++++++++---- compose/env/elasticsearch.env | 3 --- compose/env/opensearch.env | 4 ---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/compose/compose.yaml b/compose/compose.yaml index 834d0477d..dd7e37883 100644 --- a/compose/compose.yaml +++ b/compose/compose.yaml @@ -78,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. @@ -98,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 diff --git a/compose/env/elasticsearch.env b/compose/env/elasticsearch.env index acc1712ee..5856225ce 100644 --- 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 index 9ae75b55b..2a5680329 100644 --- 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 From 2180a35eadeb403017a693d9f6563bdb2ac598da Mon Sep 17 00:00:00 2001 From: Mark Shust Date: Thu, 25 Apr 2024 12:17:43 -0400 Subject: [PATCH 7/9] Update CHANGELOG and version to 47.0.0 --- CHANGELOG.md | 14 ++++++++++++++ compose/compose.yaml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0ab25bdd..659c9eae2 100644 --- 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/compose.yaml b/compose/compose.yaml index dd7e37883..c0e987cb0 100644 --- 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 From 4d0801d9f76b9a1032bb5dccfc099ad723f552f3 Mon Sep 17 00:00:00 2001 From: Mark Shust Date: Thu, 25 Apr 2024 12:19:12 -0400 Subject: [PATCH 8/9] Release 47.0.0 (#1138) (#1139) Co-authored-by: Michael Lehmkuhl Co-authored-by: Jenyamba Co-authored-by: Tu Van Co-authored-by: Cid Lopes From b6b46f56c5048e8435179d01136167c6b4f6d6bb Mon Sep 17 00:00:00 2001 From: Mark Shust Date: Thu, 25 Apr 2024 12:35:35 -0400 Subject: [PATCH 9/9] Fix "The current directory is not empty" message appearing on new install (#1140) Co-authored-by: Michael Lehmkuhl Co-authored-by: Jenyamba Co-authored-by: Tu Van Co-authored-by: Cid Lopes --- CHANGELOG.md | 5 +++++ compose/bin/download | 4 ++-- compose/compose.yaml | 2 +- lib/onelinesetup | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 659c9eae2..b0e177dc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ 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.1] - 2024-04-25 + +### Fixed +- "The current directory is not empty" message appearing on new install [PR #1141](https://github.com/markshust/docker-magento/pull/1141). + ## [47.0.0] - 2024-04-25 ### Added diff --git a/compose/bin/download b/compose/bin/download index 9ae09b959..a540eee90 100755 --- a/compose/bin/download +++ b/compose/bin/download @@ -10,8 +10,8 @@ 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." +if [ -d "./src" ]; then + echo "Error: The \"src\" directory is not empty. Please remove all contents within this directory and try again." exit 1 fi diff --git a/compose/compose.yaml b/compose/compose.yaml index c0e987cb0..82bcf4e54 100644 --- 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 47.0.0 +## Version 47.0.1 ## To use SSH, see https://github.com/markshust/docker-magento#ssh ## Linux users, see https://github.com/markshust/docker-magento#linux diff --git a/lib/onelinesetup b/lib/onelinesetup index 62b5fbdaa..b1234baf7 100755 --- a/lib/onelinesetup +++ b/lib/onelinesetup @@ -5,6 +5,11 @@ DOMAIN=${1:-magento.test} VERSION=${2:-2.4.7} EDITION=${3:-community} +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 + curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash # &&'s are used below otherwise onelinesetup script fails/errors after bin/download