Skip to content

Commit 5aafed5

Browse files
committed
upgraded elasticsearch, logstash and kibana images and provided an environment variable to specify a version for the entire ELK stack.
1 parent cd84c46 commit 5aafed5

5 files changed

Lines changed: 21 additions & 6 deletions

File tree

docker-compose.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,10 @@ services:
770770

771771
### ElasticSearch ########################################
772772
elasticsearch:
773-
build: ./elasticsearch
773+
build:
774+
context: ./elasticsearch
775+
args:
776+
- ELK_VERSION=${ELK_VERSION}
774777
volumes:
775778
- elasticsearch:/usr/share/elasticsearch/data
776779
environment:
@@ -794,7 +797,10 @@ services:
794797

795798
### Logstash ##############################################
796799
logstash:
797-
build: ./logstash
800+
build:
801+
context: ./logstash
802+
args:
803+
- ELK_VERSION=${ELK_VERSION}
798804
volumes:
799805
- './logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml'
800806
- './logstash/pipeline:/usr/share/logstash/pipeline'
@@ -812,7 +818,10 @@ services:
812818

813819
### Kibana ##############################################
814820
kibana:
815-
build: ./kibana
821+
build:
822+
context: ./kibana
823+
args:
824+
- ELK_VERSION=${ELK_VERSION}
816825
ports:
817826
- "${KIBANA_HTTP_PORT}:5601"
818827
depends_on:

elasticsearch/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
FROM docker.elastic.co/elasticsearch/elasticsearch:7.1.1
1+
ARG ELK_VERSION=7.5.1
2+
FROM docker.elastic.co/elasticsearch/elasticsearch:${ELK_VERSION}
23

34
EXPOSE 9200 9300

env-example

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,3 +848,6 @@ GEARMAN_MYSQL_PASSWORD_FILE=
848848
GEARMAN_MYSQL_DB=Gearmand
849849
# Table to use by Gearman (Default: gearman_queue)
850850
GEARMAN_MYSQL_TABLE=gearman_queue
851+
852+
### ELK Stack ##################################################
853+
ELK_VERSION=7.5.1

kibana/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
FROM docker.elastic.co/kibana/kibana:7.1.1
1+
ARG ELK_VERSION=7.5.1
2+
FROM docker.elastic.co/kibana/kibana:${ELK_VERSION}
23

34
EXPOSE 5601

logstash/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM docker.elastic.co/logstash/logstash:6.4.2
1+
ARG ELK_VERSION=7.5.1
2+
FROM docker.elastic.co/logstash/logstash:${ELK_VERSION}
23

34
USER root
45
RUN rm -f /usr/share/logstash/pipeline/logstash.conf

0 commit comments

Comments
 (0)