Merge pull request #48 from pablobae/dev

Dev

CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Version](http://semver.org/spec/v2.0.0.htm
 ### Changed
 ### Removed
 
+## [1.1.4] - 05-05-2022
+### Added
+* Added Support for ElasticSearch 7.16
+### Changed
+* BugFix: Fix services information displayed after installing Magento, and command bin/describe
+* Bugfix: Update auth.json generation file
+
 ## [1.1.3] - 25-02-2022
 ### Added
 * Bugfix: Sed parameter issue on Ubuntu when creating projects.
@@ -25,7 +32,7 @@ and this project adheres to [Semantic Version](http://semver.org/spec/v2.0.0.htm
 ## [1.1.1] - 03-10-2021
 ### Added
 * Bugfix: Elasticsearch magento cli installation parameters not available for Magento 2.3.X
-* Bufgix: Unable to connect to mailhog service from Magento  
+* Bugfix: Unable to connect to mailhog service from Magento  
 * Feature: SampleData optionally installable during the project creation 
 * Added RabbitMQ service optionally installable during the project creation
 

README.md

@@ -9,7 +9,7 @@ This project aims to offer a quick and easy solution for preparing Magento local
 ## Features included:
 * **one-command** installation
 * Supported OS: **Mac**, **Windows WSL**, **Ubuntu** and **Debian**  
-* Magento 2 version **configurable**: From 2.3.0 to 2.4.X
+* Magento 2 version **configurable**: From 2.3.0 to 2.4.5
 * **PHP** version selector: from 7.2 to 8.1
 * Database engine selector: **MariaDB** or **Mysql**
 * MariaDB and Mysql version selector
@@ -56,7 +56,7 @@ It's possible to configure:
 * Database engine: **MySQL** or **MariaDB**
 * **PHP version**: from version 7.2 to 8.1 
 * **Composer**: version 1 or 2  
-* **Elasticsearch** optional node and Elasticsearch version: from version 5 to 7.10.1
+* **Elasticsearch** optional node and Elasticsearch version: from version 5 to 7.16.1
 * **RabbitMQ** optional node and RabbitMQ version: from version 3.7 to 3.8. Web management included.
 
 

bin/createmagentoauthjson

@@ -18,13 +18,19 @@ source ${CURRENT_PATH}/../conf/project.conf
 source ${CONF_PATH}/env/db.env
 
 generate_auth_json_file() {
-  cp ${SRC_PATH}/auth.json.sample ${SRC_PATH}/auth.json
   read -p "Please, enter your Magento public key: " publickey
   read -p "Enter your magento private key: " privatekey
-  sed -i ${SED_FIRST_PARAMETER} "s/<public-key>/${publickey}/g" ${SRC_PATH}/auth.json
-  sed -i ${SED_FIRST_PARAMETER} "s/<private-key>/${privatekey}/g" ${SRC_PATH}/auth.json
-  ${BIN_PATH}/copytocontainer auth.json
-  rm -f ${SRC_PATH}/auth.json${SED_FIRST_PARAMETER}
+
+  echo '' > ${SRC_PATH}/auth.json
+  echo "{" >> ${SRC_PATH}/auth.json
+  echo '    "http-basic": {' >> ${SRC_PATH}/auth.json
+  echo '        "repo.magento.com": {' >> ${SRC_PATH}/auth.json
+  echo '            "username": "'${publickey}'",' >> ${SRC_PATH}/auth.json
+  echo '            "password": "'${privatekey}'"' >> ${SRC_PATH}/auth.json
+  echo '        }' >> ${SRC_PATH}/auth.json
+  echo '    }' >> ${SRC_PATH}/auth.json
+  echo '}' >> ${SRC_PATH}/auth.json
+
   echo "File generated"
 }
 
@@ -53,3 +59,5 @@ else
   fi
   generate_auth_json_file
 fi
+${BIN_PATH}/copytocontainer auth.json
+

bin/describe

@@ -20,22 +20,26 @@ echo ""
 echo "PROJECT SERVICES INFORMATION"
 echo "Project Name: ${PROJECT_NAME}"
 echo "Project URL: https://${BASE_URL}"
+echo ""
 echo "Database Service:"
 echo "- Server from host: ${BASE_URL}"
 echo "- Server from container: ${DOCKER_SERVICE_DB}"
-echo "Mailhog Service: https://${BASE_URL}:8025"
+echo ""
+echo "Mailhog Service: http://${BASE_URL}:8025"
 
 if [[ "${ELASTICSEARCH}" == "yes" ]]; then
+  echo ""
   echo "Elasticsearch information:"
   echo "- host: ${DOCKER_SERVICE_ELASTICSEARCH}"
   echo "- port: 9200"
 fi
 
 if [[ "${RABBITMQ}" == "yes" ]]; then
+  echo ""
   echo "RabbitMQ:"
   echo "- Server from host: ${BASE_URL}"
   echo "- Server from container: ${DOCKER_SERVICE_RABBITMQ}"
   echo "- Port: 5672"
   echo "- Management port: 15672"
-  echo "- Management URL: https://${BASE_URL}:15672"
+  echo "- Management URL: http://${BASE_URL}:15672"
 fi

create-project.sh

@@ -151,7 +151,7 @@ read -p "Do you want to use Elasticsearch? [Y/N]: " option
         ADD_ELASTICSEARCH_INSTALL_PARAMETERS=no
       fi
       while true; do
-        read -p "Which version of ELASTICSEARCH do you want to install 5.x [1], 6.x [2], 7.6 [3], 7.7 [4], 7.9 [5] or 7.10 [6]? [1/2/3/4/5/6]: " option
+        read -p "Which version of ELASTICSEARCH do you want to install 5.x [1], 6.x [2], 7.6 [3], 7.7 [4], 7.9 [5], 7.10 [6] or 7.16 [7]? [1/2/3/4/5/6/7]: " option
         case $option in
           1)
             ELASTICSEARCH_VERSION="5-alpine"
@@ -189,7 +189,13 @@ read -p "Do you want to use Elasticsearch? [Y/N]: " option
               ELASTICSEARCH_INSTALL_OPTIONS=" --search-engine=elasticsearch7 --elasticsearch-host=${DOCKER_SERVICE_ELASTICSEARCH} --elasticsearch-port=9200"
             fi
             break;;
-          *) echo "Please answer 1, 2, 3, 4 ,5 or 6";;
+          7)
+            ELASTICSEARCH_VERSION="7.16.3"
+            if [[ "${ADD_ELASTICSEARCH_INSTALL_PARAMETERS}" == "yes" ]]; then
+              ELASTICSEARCH_INSTALL_OPTIONS=" --search-engine=elasticsearch7 --elasticsearch-host=${DOCKER_SERVICE_ELASTICSEARCH} --elasticsearch-port=9200"
+            fi
+            break;;
+          *) echo "Please answer 1, 2, 3, 4 ,5, 6 or 7";;
         esac
       done
       echo "ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION}" >> ./conf/project.conf
@@ -427,7 +433,16 @@ echo "- admin user: ${ADMIN_USER}"
 echo "- admin password: ${ADMIN_PASSWORD}"
 echo "- admin email: ${ADMIN_EMAIL}"
 
+echo ""
+echo "Database Service:"
+echo "- Server from host: ${BASE_URL}"
+echo "- Server from container: ${DOCKER_SERVICE_DB}"
+
+echo ""
+echo "Mailhog Service URL: http://${BASE_URL}:8025"
+
 if [[ "${ELASTICSEARCH}" == "yes" ]]; then
+  echo ""
   echo "Elasticsearch information:"
   echo "- host: ${DOCKER_SERVICE_ELASTICSEARCH}"
   echo "- port: 9200"
@@ -437,10 +452,14 @@ if [[ "${ELASTICSEARCH}" == "yes" ]]; then
   fi
 fi
 if [[ "${RABBITMQ}" == "yes" ]]; then
+  echo ""
   echo "RabbitMQ information:"
   echo "- host: ${DOCKER_SERVICE_RABBITMQ} | 127.0.0.1"
   echo "- port: 5672"
   echo "- management port: 15672"
+  echo "- management URL: http://${BASE_URL}:15672"
   echo "- user:  ${RABBITMQ_DEFAULT_USER}"
   echo "- password:  ${RABBITMQ_DEFAULT_PASS}"
 fi
+echo ""
+echo "Remember: you can display the command bin/describe to display the information of project services"