Merge pull request #35 from pablobae/dev

Release 1.1.1

CHANGELOG.md

@@ -9,29 +9,28 @@ and this project adheres to [Semantic Version](http://semver.org/spec/v2.0.0.htm
 ### Changed
 ### Removed
 
+## [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  
+* Feature: SampleData optionally installable during the project creation 
+* Added RabbitMQ service optionally installable during the project creation
+
 ## [1.1.0] - 30-09-2021
 ### Added
 * Added support for Magento 2.4.X
 * Added ElasticSearch node support
 * Added Database Engine selection: Msql or MariaDB
-* Added option to select versions to be installed for PHP, MariaDB, Mysql Elasticsearch
+* Added option to select versions to be installed for PHP, MariaDB, Mysql, Composer and Elasticsearch
 * Added TIMEZONE variable for configure Magento timezone 
-
 ### Changed
-
-* Create-project script updated. Now it's possible to configure the environment: PHP version, Mysql or MariadB version, Elasticsearch ...  
-
-
-
+* Create-project script updated. Now it's possible to configure the environment: PHP version, Mysql or MariaDB version, Elasticsearch ...  
 
 ## [1.0.5] - 18-04-2021
 ### Added
 * Added support for xDebug v3+
 * Bugfix: docker compose yml configuration files not found when bin commands are not called from the environment folder.
 
-### Changed
-### Removed
-
 ## [1.0.4] - 06-04-2021
 ### Added
 * Added **reset** command to restore local environment files, docker data,..
@@ -42,15 +41,11 @@ and this project adheres to [Semantic Version](http://semver.org/spec/v2.0.0.htm
 * Added **sync** command to synchronize local environment (database and media) from remote servers
 * Added **clone** command to import data from a github repository
 * Added **--help** option to all **bin/commands** to display command information
-
-
 ### Changed
 * Updated **start** and **stop** command to support docker-compose.override files
 * Updated **create-project.sh** script to support performance command
 * bin/commands issue when they are called from not project root folder
 
-### Removed
-
 ## [1.0.3] - 20-03-2021
 ### Removed
 * Auth.json generation
@@ -59,21 +54,16 @@ and this project adheres to [Semantic Version](http://semver.org/spec/v2.0.0.htm
 ### Added
 * Displaying detected OS while project creation
 * Displaying backend information when sucessful install
-
 ### Changed
 * Improving information for SSL generation in WSL
-
 ### Removed
 * Removing comments
 
-
 ## [1.0.1] - 12-03-2021
 ### Added
 * Changelog file
-
 ### Changed
 * Fix OS detect on create-project script
 * Update documentation
-
 ## [1.0] - 29-09-2020
 * First working version

README.md

@@ -1,6 +1,6 @@
 # Dockerized Magento 2 devel environment 
 
-Docker environment for Magento 2 projects development with **PHPFPM**, **MariaDB** or **MySQL**, **Nginx**, **Elasticsearch** and **Mailhog**.
+Docker environment for Magento 2 projects development with **PHPFPM**, **MariaDB** or **MySQL**, **Nginx**, **Elasticsearch**, **RabbitMQ** and **Mailhog**.
 
 ## Motivation
 
@@ -9,15 +9,16 @@ 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 the latest
-* PHP version selector: from 7.2 to 8.1
-* Database engine selector: MariaDB or Mysql
-* MariaDB version selector
-* Elasticsearch optional and version selector  
+* Magento 2 version **configurable**: From 2.3.0 to 2.4.X
+* **PHP** version selector: from 7.2 to 8.1
+* Database engine selector: **MariaDB** or **Mysql**
+* MariaDB and Mysql version selector
+* **Elasticsearch** optional and version selector
+* **RabbitMQ** optional and version selector
 * Multi-project: docker service names are created dynamically by project
 * Xdebug ready
 * Docker mounted points optimization
-* Sync data from production and test server included
+* **Sync** data from production and test server included
 
 
 ## Download
@@ -55,7 +56,8 @@ It's possible to configure:
 * Database engine: **MySQL** or **MariaDB**
 * **PHP version**: from version 7.2 to 8.1 
 * **Composer**: version 1 or 2  
-* Add **Elasticsearch** node and Elasticsearch version: from version 5 to 7.10.1
+* **Elasticsearch** optional node and Elasticsearch version: from version 5 to 7.10.1
+* **RabbitMQ** optional node and RabbitMQ version: from version 3.7 to 3.8. Web management included.
 
 
 ### Composer Authentication
@@ -111,8 +113,8 @@ You can find a large list of useful command on **bin** folder, including:
 * **bin/composer**: to run composer commands inside the container
 * **bin/magento**: to run magento 2 cli inside the container
 * **bin/databaseimport**: to import database
-* **bin/sync**: to syncronyze local database with remote database
-* **bin/clone**: to clone data from githubrepository
+* **bin/sync**: to synchronize data from production and stage environments
+* **bin/clone**: to clone data from github repository
 * ...
 
 You can get detailed information of each command and how to use it running the command with the **--help** option:
@@ -125,7 +127,6 @@ bin/bash --help
 
 
 ### TODO
-* Add rabittmq
 * Add Varnish
 * Add Redis
 

bin/removevolumes

@@ -6,9 +6,14 @@ if [ "$1" == "--help" ]; then
   echo "USAGE: removevolumes"
   exit
 fi
+CURRENT_PATH="$(cd "$(dirname "$0")" && pwd)"
+source $CURRENT_PATH/../conf/project.conf
 
 current_folder=${PWD##*/}
 volume_prefix=`echo $current_folder | awk '{print tolower($0)}' | sed 's/\.//g'`
 docker volume rm ${volume_prefix}_appdata
 docker volume rm ${volume_prefix}_sockdata
 docker volume rm ${volume_prefix}_ssldata
+if [ "${RABBITMQ}" == "yes" ]; then
+  docker volume rm ${volume_prefix}_rabbitmqdata
+fi

bin/reset

@@ -9,14 +9,15 @@ if [ "$1" == "--help" ]; then
 fi
 
 CURRENT_PATH="$(cd "$(dirname "$0")" && pwd)"
-source $CURRENT_PATH/../conf/project.conf
+source ${CURRENT_PATH}/../conf/project.conf
 
 $BIN_PATH/stop &&
-  $BIN_PATH/removeall
-rm -rf $PROJECT_PATH/src >/dev/null
-rm -rf $PROJECT_PATH/docker* >/dev/null
-rm -rf $PROJECT_PATH/*.sql >/dev/null
-rm -rf $CONF_PATH/repo.conf >/dev/null
-rm -rf $CONF_PATH/syncservers.conf >/dev/null
-rm -rf $CONF_PATH/project.conf >/dev/null
-rm -rf $CONF_PATH/docker/phpfpm/Dockerfile >/dev/null
+$BIN_PATH/removeall
+rm -rf ${PROJECT_PATH}/src >/dev/null
+rm -rf ${PROJECT_PATH}/docker* >/dev/null
+rm -rf ${PROJECT_PATH}/*.sql >/dev/null
+rm -rf ${CONF_PATH}/repo.conf >/dev/null
+rm -rf ${CONF_PATH}/syncservers.conf >/dev/null
+rm -rf ${CONF_PATH}/project.conf >/dev/null
+rm -rf ${CONF_PATH}/docker/phpfpm/Dockerfile >/dev/null
+rm -rf ${CONF_PATH}/php/php.ini >/dev/null

conf/docker/compose-templates/nginx.docker-compose.yml

@@ -8,6 +8,7 @@
     links:
       - db_PROJECTNAME_m2
       - phpfpm_PROJECTNAME_m2
+      LINK_RABBITMQ
     volumes: &appvolumes
 #      - ./src:/var/www/html:delegated
 #      - ./conf/nginx/nginx.conf:/etc/nginx/nginx.conf:delegated

conf/docker/compose-templates/rabbitmq.docker-compose.yml

@@ -0,0 +1,9 @@
+  rabbitmq_PROJECTNAME_m2:
+    image: rabbitmq:RABBITMQ_VERSION
+    env_file:
+      - conf/env/rabbitmq.env
+    volumes:
+      - rabbitmqdata:/var/lib/rabbitmq
+    ports:
+      - '5672:5672'
+      - '15672:15672'

conf/docker/compose-templates/volumes.docker-compose.yml

@@ -2,3 +2,4 @@ volumes:
   appdata:
   sockdata:
   ssldata:
+  VOLUME_RABBITMQ_DATA

conf/env/rabbitmq.env

@@ -0,0 +1,2 @@
+RABBITMQ_DEFAULT_USER=rabbit
+RABBITMQ_DEFAULT_PASS=rabbitpassword

conf/php/php.ini → conf/php/php.ini.template

@@ -17,4 +17,4 @@ upload_max_filesize = 100M
 post_max_size = 100M
 max_input_vars = 10000
 
-sendmail_path = "/usr/local/bin/mhsendmail --smtp-addr=mailhog:1025"
+sendmail_path = "/usr/local/bin/mhsendmail --smtp-addr=DOCKER_SERVICE_MAILHOG:1025"