ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2474 from brnathanlima/update-elasticsearch-logstash-and-kibana-to-use-the-same-version 

Improvements on ELK Stack images
This commit is contained in:
Dwi Fahni Denni (dfdenni) 2020-02-05 12:44:25 +07:00 committed by GitHub
parent c670d5f98b 5aafed586b
commit fb57c52ca6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker-compose.yml
View File

@ -774,7 +774,10 @@ services:
### ElasticSearch ######################################## ### ElasticSearch ########################################
elasticsearch: elasticsearch:
build: ./elasticsearch build:
context: ./elasticsearch
args:
- ELK_VERSION=${ELK_VERSION}
volumes: volumes:
- elasticsearch:/usr/share/elasticsearch/data - elasticsearch:/usr/share/elasticsearch/data
environment: environment:
@ -798,7 +801,10 @@ services:
### Logstash ############################################## ### Logstash ##############################################
logstash: logstash:
build: ./logstash build:
context: ./logstash
args:
- ELK_VERSION=${ELK_VERSION}
volumes: volumes:
- './logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml' - './logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml'
- './logstash/pipeline:/usr/share/logstash/pipeline' - './logstash/pipeline:/usr/share/logstash/pipeline'
@ -816,7 +822,10 @@ services:
### Kibana ############################################## ### Kibana ##############################################
kibana: kibana:
build: ./kibana build:
context: ./kibana
args:
- ELK_VERSION=${ELK_VERSION}
ports: ports:
- "${KIBANA_HTTP_PORT}:5601" - "${KIBANA_HTTP_PORT}:5601"
depends_on: depends_on:

3
elasticsearch/Dockerfile
View File

@ -1,3 +1,4 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:7.1.1 ARG ELK_VERSION=7.5.1
FROM docker.elastic.co/elasticsearch/elasticsearch:${ELK_VERSION}
EXPOSE 9200 9300 EXPOSE 9200 9300

3
env-example
View File

@ -849,3 +849,6 @@ GEARMAN_MYSQL_PASSWORD_FILE=
GEARMAN_MYSQL_DB=Gearmand GEARMAN_MYSQL_DB=Gearmand
# Table to use by Gearman (Default: gearman_queue) # Table to use by Gearman (Default: gearman_queue)
GEARMAN_MYSQL_TABLE=gearman_queue GEARMAN_MYSQL_TABLE=gearman_queue
### ELK Stack ##################################################
ELK_VERSION=7.5.1

3
kibana/Dockerfile
View File

@ -1,3 +1,4 @@
FROM docker.elastic.co/kibana/kibana:7.1.1 ARG ELK_VERSION=7.5.1
FROM docker.elastic.co/kibana/kibana:${ELK_VERSION}
EXPOSE 5601 EXPOSE 5601

3
logstash/Dockerfile
View File

@ -1,4 +1,5 @@
FROM docker.elastic.co/logstash/logstash:6.4.2 ARG ELK_VERSION=7.5.1
FROM docker.elastic.co/logstash/logstash:${ELK_VERSION}
USER root USER root
RUN rm -f /usr/share/logstash/pipeline/logstash.conf RUN rm -f /usr/share/logstash/pipeline/logstash.conf