Merge branch 'master' of https://github.com/yeszao/dnmp

Author: jingmian

docker-compose-sample.yml

@@ -82,8 +82,8 @@ services:
     networks:
           - default
     ports:
-      - "5672:5672"
-      - "15672:15672"
+      - "${RABBITMQ_HOST_PORT_C}:5672"
+      - "${RABBITMQ_HOST_PORT_S}:15672"
     environment:
       - RABBITMQ_DEFAULT_USER="${RABBITMQ_DEFAULT_USER}"
       - RABBITMQ_DEFAULT_PASS="${RABBITMQ_DEFAULT_PASS}"
@@ -108,5 +108,46 @@ services:
       - REDIS_1_HOST=redis
       - REDIS_1_PORT=6379
 
+  elasticsearch:
+    image: elasticsearch:${ELASTICSEARCH_VERSION}
+    container_name: elasticsearch${ELASTICSEARCH_VERSION}
+    environment:
+      - discovery.type=single-node
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    volumes:
+      - ${ELASTICSEARCH_DATA_DIR}:/usr/share/elasticsearch/data
+    hostname: elasticsearch
+    restart: always
+    ports:
+      - "${ELASTICSEARCH_HOST_PORT_C}:9200"
+      - "${ELASTICSEARCH_HOST_PORT_S}:9300"
+
+  kibana:
+    image: kibana:${KIBANA_VERSION}
+    container_name: kibana${KIBANA_VERSION}
+    environment:
+      - elasticsearch.hosts=http://elasticsearch:9200
+    hostname: kibana
+    depends_on:
+      - elasticsearch
+    restart: always
+    ports:
+      - "${KIBANA_HOST}:5601"
+
+  logstash:
+    image: logstash:${LOGSTASH_VERSION}
+    container_name: logstash${LOGSTASH_VERSION}
+    hostname: logstash
+    restart: always
+    depends_on:
+      - elasticsearch
+    ports:
+      - "${LOGSTASH_HOST_PORT_C}:9600"
+      - "${LOGSTASH_HOST_PORT_S}:5044"
+
+volumes:
+  esdata:
+    driver: local
+
 networks:
   default:

env.sample

@@ -42,7 +42,7 @@ PHP72_VERSION=7.2.19
 PHP72_PHP_CONF_FILE=./conf/php.ini
 PHP72_FPM_CONF_FILE=./conf/php-fpm.conf
 PHP72_LOG_DIR=./log/php
-PHP72_EXTENSIONS=pdo_mysql,opcache,redis
+PHP72_EXTENSIONS=pdo_mysql,opcache,redis,amqp,swoole
 
 
 #################### PHP5.6 ####################
@@ -54,9 +54,28 @@ PHP56_EXTENSIONS=opcache,redis
 
 #################### RABBITMQ #####################
 RABBITMQ_VERSION=management
+RABBITMQ_HOST_PORT_C=5672
+RABBITMQ_HOST_PORT_S=15672
 RABBITMQ_DEFAULT_USER=myuser
 RABBITMQ_DEFAULT_PASS=mypass
 
+#################### ELASTICSEARCH #####################
+ELASTICSEARCH_VERSION=7.1.1
+ELASTICSEARCH_HOSTNAME=kibana
+ELASTICSEARCH_DATA_DIR=esdata
+ELASTICSEARCH_HOST_PORT_C=9200
+ELASTICSEARCH_HOST_PORT_S=9300
+
+#################### KIBANA #####################
+KIBANA_VERSION=7.1.1
+KIBANA_HOST=5601
+
+#################### LOGSTASH #####################
+LOGSTASH_VERSION=7.1.1
+LOGSTASH_HOST=5601
+LOGSTASH_HOST_PORT_C=9600
+LOGSTASH_HOST_PORT_S=5044
+
 #################### MySQL #####################
 MYSQL_VERSION=8.0.13
 MYSQL_HOST_PORT=3306