From 8a7e81815e778afbd7230b1370432f6c28099129 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Wed, 2 Dec 2020 22:36:17 +0000
Subject: [PATCH] prep for Elastic Stack 7.10.0

---
 docker/elk/elasticsearch/Dockerfile |  2 +-
 docker/elk/kibana/Dockerfile        |  2 +-
 docker/elk/logstash/Dockerfile      | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile
index 440ea8e8..e74af333 100644
--- a/docker/elk/elasticsearch/Dockerfile
+++ b/docker/elk/elasticsearch/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.12
 #
 # VARS
-ENV ES_VER=7.9.3 \
+ENV ES_VER=7.10.0 \
     JAVA_HOME=/usr/lib/jvm/java-11-openjdk
 # Include dist
 ADD dist/ /root/dist/
diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile
index 4e0271bb..87caafd6 100644
--- a/docker/elk/kibana/Dockerfile
+++ b/docker/elk/kibana/Dockerfile
@@ -1,7 +1,7 @@
 FROM node:10.22.1-alpine
 #
 # VARS
-ENV KB_VER=7.9.3
+ENV KB_VER=7.10.0
 # 
 # Include dist
 ADD dist/ /root/dist/
diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile
index b7dde71a..1a353f32 100644
--- a/docker/elk/logstash/Dockerfile
+++ b/docker/elk/logstash/Dockerfile
@@ -1,13 +1,13 @@
-FROM alpine:3.12
+FROM alpine:edge
 #
 # VARS
-ENV LS_VER=7.9.3
+ENV LS_VER=7.10.0
 # Include dist
 ADD dist/ /root/dist/
 #
 # Setup env and apt
-RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
-    apk -U --no-cache add \
+#RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
+RUN apk -U --no-cache add \
              aria2 \
              bash \
              bzip2 \
@@ -25,8 +25,9 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
     bunzip2 *.bz2 && \
     cd /root/dist/ && \
     mkdir -p /usr/share/logstash/ && \
-    aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/logstash/logstash-$LS_VER.tar.gz && \
-    tar xvfz logstash-$LS_VER.tar.gz --strip-components=1 -C /usr/share/logstash/ && \
+    aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/logstash/logstash-$LS_VER-linux-x86_64.tar.gz && \
+    tar xvfz logstash-$LS_VER-linux-x86_64.tar.gz --strip-components=1 -C /usr/share/logstash/ && \
+    rm -rf /usr/share/logstash/jdk && \
     /usr/share/logstash/bin/logstash-plugin install logstash-filter-translate && \
     /usr/share/logstash/bin/logstash-plugin install logstash-output-syslog && \
 #