upgraded elasticsearch, logstash and kibana images and provided an environment variable to specify a version for the entire ELK stack.

This commit is contained in:
Nathanael 2020-01-22 15:37:04 -03:00
parent cd84c464b3
commit 5aafed586b
5 changed files with 21 additions and 6 deletions

View File

@ -770,7 +770,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:
@ -794,7 +797,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'
@ -812,7 +818,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:

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

View File

@ -848,3 +848,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

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

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