Skip to content

Commit 031aff6

Browse files
committedJul 5, 2019
Merge branch 'master' of https://github.com/yeszao/dnmp
2 parents 5b6bf55 + a3b5127 commit 031aff6

File tree

2 files changed

+63
-3
lines changed

2 files changed

+63
-3
lines changed
 

‎docker-compose-sample.yml

+43-2
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ services:
8282
networks:
8383
- default
8484
ports:
85-
- "5672:5672"
86-
- "15672:15672"
85+
- "${RABBITMQ_HOST_PORT_C}:5672"
86+
- "${RABBITMQ_HOST_PORT_S}:15672"
8787
environment:
8888
- RABBITMQ_DEFAULT_USER="${RABBITMQ_DEFAULT_USER}"
8989
- RABBITMQ_DEFAULT_PASS="${RABBITMQ_DEFAULT_PASS}"
@@ -108,5 +108,46 @@ services:
108108
- REDIS_1_HOST=redis
109109
- REDIS_1_PORT=6379
110110

111+
elasticsearch:
112+
image: elasticsearch:${ELASTICSEARCH_VERSION}
113+
container_name: elasticsearch${ELASTICSEARCH_VERSION}
114+
environment:
115+
- discovery.type=single-node
116+
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
117+
volumes:
118+
- ${ELASTICSEARCH_DATA_DIR}:/usr/share/elasticsearch/data
119+
hostname: elasticsearch
120+
restart: always
121+
ports:
122+
- "${ELASTICSEARCH_HOST_PORT_C}:9200"
123+
- "${ELASTICSEARCH_HOST_PORT_S}:9300"
124+
125+
kibana:
126+
image: kibana:${KIBANA_VERSION}
127+
container_name: kibana${KIBANA_VERSION}
128+
environment:
129+
- elasticsearch.hosts=http://elasticsearch:9200
130+
hostname: kibana
131+
depends_on:
132+
- elasticsearch
133+
restart: always
134+
ports:
135+
- "${KIBANA_HOST}:5601"
136+
137+
logstash:
138+
image: logstash:${LOGSTASH_VERSION}
139+
container_name: logstash${LOGSTASH_VERSION}
140+
hostname: logstash
141+
restart: always
142+
depends_on:
143+
- elasticsearch
144+
ports:
145+
- "${LOGSTASH_HOST_PORT_C}:9600"
146+
- "${LOGSTASH_HOST_PORT_S}:5044"
147+
148+
volumes:
149+
esdata:
150+
driver: local
151+
111152
networks:
112153
default:

‎env.sample

+20-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ PHP72_VERSION=7.2.19
4242
PHP72_PHP_CONF_FILE=./conf/php.ini
4343
PHP72_FPM_CONF_FILE=./conf/php-fpm.conf
4444
PHP72_LOG_DIR=./log/php
45-
PHP72_EXTENSIONS=pdo_mysql,opcache,redis
45+
PHP72_EXTENSIONS=pdo_mysql,opcache,redis,amqp,swoole
4646

4747

4848
#################### PHP5.6 ####################
@@ -54,9 +54,28 @@ PHP56_EXTENSIONS=opcache,redis
5454

5555
#################### RABBITMQ #####################
5656
RABBITMQ_VERSION=management
57+
RABBITMQ_HOST_PORT_C=5672
58+
RABBITMQ_HOST_PORT_S=15672
5759
RABBITMQ_DEFAULT_USER=myuser
5860
RABBITMQ_DEFAULT_PASS=mypass
5961

62+
#################### ELASTICSEARCH #####################
63+
ELASTICSEARCH_VERSION=7.1.1
64+
ELASTICSEARCH_HOSTNAME=kibana
65+
ELASTICSEARCH_DATA_DIR=esdata
66+
ELASTICSEARCH_HOST_PORT_C=9200
67+
ELASTICSEARCH_HOST_PORT_S=9300
68+
69+
#################### KIBANA #####################
70+
KIBANA_VERSION=7.1.1
71+
KIBANA_HOST=5601
72+
73+
#################### LOGSTASH #####################
74+
LOGSTASH_VERSION=7.1.1
75+
LOGSTASH_HOST=5601
76+
LOGSTASH_HOST_PORT_C=9600
77+
LOGSTASH_HOST_PORT_S=5044
78+
6079
#################### MySQL #####################
6180
MYSQL_VERSION=8.0.13
6281
MYSQL_HOST_PORT=3306

0 commit comments

Comments
 (0)