provide fix for #669

This commit is contained in:
t3chn0m4g3
2020-07-06 23:30:11 +00:00
parent 9b7f100f74
commit 6d29f504df
11 changed files with 20 additions and 4 deletions

View File

@ -46,6 +46,8 @@ services:
build: logstash/.
container_name: logstash
restart: always
environment:
- LS_JAVA_OPTS=-Xms2048m -Xmx2048m
depends_on:
elasticsearch:
condition: service_healthy

View File

@ -1,4 +1,4 @@
FROM alpine
FROM alpine:3.12
#
# VARS
ENV ES_VER=7.8.0 \

View File

@ -1,4 +1,4 @@
FROM alpine:latest
FROM alpine:3.12
#
# Setup env and apt
RUN apk -U add \

View File

@ -1,4 +1,4 @@
FROM alpine
FROM alpine:3.12
#
# VARS
ENV LS_VER=7.8.0
@ -56,4 +56,5 @@ HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9600'
#
# Start logstash
#USER logstash:logstash
#CMD update.sh && exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf --config.reload.automatic --java-execution --log.level debug
CMD update.sh && exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf --config.reload.automatic --java-execution

View File

@ -7,6 +7,8 @@ services:
build: .
container_name: logstash
restart: always
environment:
- LS_JAVA_OPTS=-Xms2048m -Xmx2048m
# depends_on:
# elasticsearch:
# condition: service_healthy
@ -15,4 +17,4 @@ services:
image: "dtagdevsec/logstash:2006"
volumes:
- /data:/data
- /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf
# - /root/tpotce/docker/elk/logstash/dist/logstash.conf:/etc/logstash/conf.d/logstash.conf