Merge branch 'release/next' into feature/multi-domain-ssl-support

markshust · Jun 10, 2024 · 6b38a90 · 6b38a90
2 parents 32033e5 + 6e0f08e
commit 6b38a90
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -254,8 +254,8 @@ open https://magento.test
 
 ### Elasticsearch vs OpenSearch
 OpenSearch is set as the default search engine when setting up this project. Follow the instructions below if you want to use Elasticsearch instead:
-1. Comment out or remove the `opensearch` container in both the [`compose.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.yaml#L55-L66) and [`compose.healthcheck.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.healthcheck.yaml#L38-L43) files
-2. Uncomment the `elasticsearch` container in both the [`compose.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.yaml#L70-L81) and [`compose.healthcheck.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.healthcheck.yaml#L45-L50) files
+1. Comment out or remove the `opensearch` container in both the [`compose.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.yaml#L69-L84) and [`compose.healthcheck.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.healthcheck.yaml#L36-L41) files
+2. Uncomment the `elasticsearch` container in both the [`compose.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.yaml#L86-L106) and [`compose.healthcheck.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.healthcheck.yaml#L43-L48) files
 3. Update the `bin/setup-install` command to use the Elasticsearch ratther than OpenSearch. Change:
 
 ```

diff --git a/compose/bin/download b/compose/bin/download
@@ -8,13 +8,13 @@ YELLOW='\033[0;33m'
 BLUE='\033[0;34m'
 NC='\033[0m' # No Color
 
-bin/stop
-
 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
 
+bin/stop
+
 bin/start --no-dev
 [ $? != 0 ] && echo "Failed to start Docker services" && exit
 

diff --git a/lib/onelinesetup b/lib/onelinesetup
@@ -5,11 +5,6 @@ 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

diff --git a/lib/template b/lib/template
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
-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
 
+git init -qqq
+git remote add origin https://github.com/markshust/docker-magento
+git fetch origin -qqq
+git checkout origin/master -- compose
+
 mv compose/* ./
 mv compose/.gitignore ./
 mv compose/.vscode ./