Merge branch 'master' into add-tomcat

env-example

@@ -38,7 +38,7 @@ COMPOSE_PROJECT_NAME=laradock
 ### PHP Version ###########################################
 
 # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 7.3 - 7.2 - 7.1 - 7.0 - 5.6
-PHP_VERSION=7.2
+PHP_VERSION=7.3
 
 ### Phalcon Version ###########################################
 
@@ -106,6 +106,7 @@ WORKSPACE_INSTALL_XSL=false
 WORKSPACE_INSTALL_IMAP=false
 WORKSPACE_INSTALL_MONGO=false
 WORKSPACE_INSTALL_AMQP=false
+WORKSPACE_INSTALL_CASSANDRA=false
 WORKSPACE_INSTALL_MSSQL=false
 WORKSPACE_INSTALL_DRUSH=false
 WORKSPACE_DRUSH_VERSION=8.1.17
@@ -161,6 +162,7 @@ PHP_FPM_INSTALL_PHPDBG=false
 PHP_FPM_INSTALL_IMAP=false
 PHP_FPM_INSTALL_MONGO=false
 PHP_FPM_INSTALL_AMQP=false
+PHP_FPM_INSTALL_CASSANDRA=false
 PHP_FPM_INSTALL_MSSQL=false
 PHP_FPM_INSTALL_SSH2=false
 PHP_FPM_INSTALL_SOAP=false
@@ -205,6 +207,7 @@ PHP_WORKER_INSTALL_SWOOLE=false
 PHP_WORKER_INSTALL_TAINT=false
 PHP_WORKER_INSTALL_FFMPEG=false
 PHP_WORKER_INSTALL_GMP=false
+PHP_WORKER_INSTALL_CASSANDRA=false
 
 PHP_WORKER_PUID=1000
 PHP_WORKER_PGID=1000
@@ -219,6 +222,10 @@ NGINX_PHP_UPSTREAM_CONTAINER=php-fpm
 NGINX_PHP_UPSTREAM_PORT=9000
 NGINX_SSL_PATH=./nginx/ssl/
 
+### LARAVEL_HORIZON ################################################
+
+LARAVEL_HORIZON_INSTALL_SOCKETS=false
+
 ### APACHE ################################################
 
 APACHE_HOST_HTTP_PORT=80
@@ -269,6 +276,7 @@ MSSQL_PORT=1433
 
 ### MARIADB ###############################################
 
+MARIADB_VERSION=latest
 MARIADB_DATABASE=default
 MARIADB_USER=default
 MARIADB_PASSWORD=secret
@@ -387,6 +395,18 @@ CONFLUENCE_HOST_HTTP_PORT=8090
 
 GRAFANA_PORT=3000
 
+### GRAYLOG ###############################################
+
+# password must be 16 characters long
+GRAYLOG_PASSWORD=somesupersecretpassword
+# sha256 representation of the password
+GRAYLOG_SHA256_PASSWORD=b1cb6e31e172577918c9e7806c572b5ed8477d3f57aa737bee4b5b1db3696f09
+GRAYLOG_PORT=9000
+GRAYLOG_SYSLOG_TCP_PORT=514
+GRAYLOG_SYSLOG_UDP_PORT=514
+GRAYLOG_GELF_TCP_PORT=12201
+GRAYLOG_GELF_UDP_PORT=12201
+
 ### BLACKFIRE #############################################
 
 # Create an account on blackfire.io. Don't enable blackfire and xDebug at the same time. # visit https://blackfire.io/docs/24-days/06-installation#install-probe-debian for more info.
@@ -704,12 +724,12 @@ PGADMIN_DEFAULT_EMAIL=pgadmin4@pgadmin.org
 PGADMIN_DEFAULT_PASSWORD=admin
 
 ### SONARQUBE ################################################
-## docker-compose up -d sonarqube 
+## docker-compose up -d sonarqube
 ## (If you encounter a database error)
-## docker-compose exec --user=root postgres 
+## docker-compose exec --user=root postgres
 ## source docker-entrypoint-initdb.d/init_sonarqube_db.sh
 ## (If you encounter logs error)
-## docker-compose run --user=root --rm sonarqube chown sonarqube:sonarqube /opt/sonarqube/logs 
+## docker-compose run --user=root --rm sonarqube chown sonarqube:sonarqube /opt/sonarqube/logs
 
 SONARQUBE_HOSTNAME=sonar.example.com
 SONARQUBE_PORT=9000
@@ -722,3 +742,37 @@ SONARQUBE_POSTGRES_PASSWORD=sonarPass
 ### TOMCAT ################################################
 TOMCAT_VERSION=8.5.43
 TOMCAT_HOST_HTTP_PORT=8080
+
+### CASSANDRA ################################################
+
+# Cassandra Version, supported tags can be found at https://hub.docker.com/r/bitnami/cassandra/
+CASSANDRA_VERSION=latest
+# Inter-node cluster communication port. Default: 7000
+CASSANDRA_TRANSPORT_PORT_NUMBER=7000
+# JMX connections port. Default: 7199
+CASSANDRA_JMX_PORT_NUMBER=7199
+# Client port. Default: 9042.
+CASSANDRA_CQL_PORT_NUMBER=9042
+# Cassandra user name. Defaults: cassandra
+CASSANDRA_USER=cassandra
+# Password seeder will change the Cassandra default credentials at initialization. In clusters, only one node should be marked as password seeder. Default: no
+CASSANDRA_PASSWORD_SEEDER=no
+# Cassandra user password. Default: cassandra
+CASSANDRA_PASSWORD=cassandra
+# Number of tokens for the node. Default: 256.
+CASSANDRA_NUM_TOKENS=256
+# Hostname used to configure Cassandra. It can be either an IP or a domain. If left empty, it will be resolved to the machine IP.
+CASSANDRA_HOST=
+# Cluster name to configure Cassandra.. Defaults: My Cluster
+CASSANDRA_CLUSTER_NAME="My Cluster"
+# : Hosts that will act as Cassandra seeds. No defaults.
+CASSANDRA_SEEDS=
+ # Snitch name (which determines which data centers and racks nodes belong to). Default SimpleSnitch
+CASSANDRA_ENDPOINT_SNITCH=SimpleSnitch
+ # Enable the thrift RPC endpoint. Default :true
+CASSANDRA_ENABLE_RPC=true
+# Datacenter name for the cluster. Ignored in SimpleSnitch endpoint snitch. Default: dc1.
+CASSANDRA_DATACENTER=dc1
+# Rack name for the cluster. Ignored in SimpleSnitch endpoint snitch. Default: rack1.
+CASSANDRA_RACK=rack1
+