From 573ceb98a1e4359058d8b6399264bf2ddb1c6593 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Fri, 15 Mar 2019 22:23:30 +0000
Subject: [PATCH] bump elk stack to 6.6.2, replace wget with aria2 to speed up
 d/l

---
 docker/elk/elasticsearch/Dockerfile | 14 ++++++++------
 docker/elk/kibana/Dockerfile        | 15 ++++++++-------
 docker/elk/logstash/Dockerfile      | 17 +++++++++--------
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile
index a9b258f8..9423f561 100644
--- a/docker/elk/elasticsearch/Dockerfile
+++ b/docker/elk/elasticsearch/Dockerfile
@@ -4,17 +4,19 @@ FROM alpine
 ADD dist/ /root/dist/
 
 # Setup env and apt
-RUN apk -U add \
+RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
+    apk -U --no-cache add \
+             aria2 \
              bash \
              curl \
-             openjdk8-jre \
-             wget && \
+             nss \
+             openjdk8-jre && \
 
 # Get and install packages
     cd /root/dist/ && \
     mkdir -p /usr/share/elasticsearch/ && \
-    wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.6.1.tar.gz && \
-    tar xvfz elasticsearch-6.6.1.tar.gz --strip-components=1 -C /usr/share/elasticsearch/ && \
+    aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.6.2.tar.gz && \
+    tar xvfz elasticsearch-6.6.2.tar.gz --strip-components=1 -C /usr/share/elasticsearch/ && \
 
 # Add and move files
     cd /root/dist/ && \
@@ -28,7 +30,7 @@ RUN apk -U add \
     rm -rf /usr/share/elasticsearch/modules/x-pack-ml && \
 
 # Clean up
-    apk del --purge wget && \
+    apk del --purge aria2 && \
     rm -rf /root/* && \
     rm -rf /tmp/* && \
     rm -rf /var/cache/apk/*
diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile
index 02936eea..79de8b25 100644
--- a/docker/elk/kibana/Dockerfile
+++ b/docker/elk/kibana/Dockerfile
@@ -1,18 +1,19 @@
-FROM node:10.15.1-alpine
+FROM node:10.15.2-alpine
 
 # Include dist
 ADD dist/ /root/dist/
 
 # Setup env and apt
-RUN apk -U add \
-            curl \
-            wget && \
+RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
+    apk -U --no-cache add \
+            aria2 \
+            curl && \
 
 # Get and install packages
     cd /root/dist/ && \
     mkdir -p /usr/share/kibana/ && \
-    wget https://artifacts.elastic.co/downloads/kibana/kibana-6.6.1-linux-x86_64.tar.gz && \
-    tar xvfz kibana-6.6.1-linux-x86_64.tar.gz --strip-components=1 -C /usr/share/kibana/ && \
+    aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/kibana/kibana-6.6.2-linux-x86_64.tar.gz && \
+    tar xvfz kibana-6.6.2-linux-x86_64.tar.gz --strip-components=1 -C /usr/share/kibana/ && \
 
 # Kibana's bundled node does not work in alpine
     rm /usr/share/kibana/node/bin/node && \
@@ -47,7 +48,7 @@ RUN apk -U add \
     chown -R kibana:kibana /usr/share/kibana/ && \
 
 # Clean up
-    apk del --purge wget && \
+    apk del --purge aria2 && \
     rm -rf /root/* && \
     rm -rf /tmp/* && \
     rm -rf /var/cache/apk/*
diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile
index 8f02fcbe..0139f8eb 100644
--- a/docker/elk/logstash/Dockerfile
+++ b/docker/elk/logstash/Dockerfile
@@ -4,26 +4,27 @@ FROM alpine
 ADD dist/ /root/dist/
 
 # Setup env and apt
-RUN sed -i 's/dl-cdn/dl-4/g' /etc/apk/repositories && \
+RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
     apk -U --no-cache add \
+             aria2 \
              bash \
              curl \
              git \
              libc6-compat \
              libzmq \
-             openjdk8-jre \
-             wget && \
+             nss \
+             openjdk8-jre && \
 
 # Get and install packages
     git clone --depth=1 https://github.com/dtag-dev-sec/listbot /etc/listbot && \
     cd /root/dist/ && \
     mkdir -p /usr/share/logstash/ && \
-    wget https://artifacts.elastic.co/downloads/logstash/logstash-6.6.1.tar.gz && \
-    wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz && \
-    tar xvfz logstash-6.6.1.tar.gz --strip-components=1 -C /usr/share/logstash/ && \
+    aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/logstash/logstash-6.6.2.tar.gz && \
+    tar xvfz logstash-6.6.2.tar.gz --strip-components=1 -C /usr/share/logstash/ && \
     /usr/share/logstash/bin/logstash-plugin install logstash-filter-translate && \
     /usr/share/logstash/bin/logstash-plugin install logstash-output-syslog && \
-    tar xvfz GeoLite2-ASN.tar.gz --strip-components=1 -C /usr/share/logstash/vendor/bundle/jruby/2.3.0/gems/logstash-filter-geoip-5.0.3-java/vendor/ && \
+    aria2c -s 16 -x 16 -o GeoLite2-ASN.tar.gz http://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz && \
+    tar xvfz GeoLite2-ASN.tar.gz --strip-components=1 -C /usr/share/logstash/vendor/bundle/jruby/2.3.0/gems/logstash-filter-geoip-5.0.3-java/vendor && \
 
 # Add and move files
     cd /root/dist/ && \
@@ -41,7 +42,7 @@ RUN sed -i 's/dl-cdn/dl-4/g' /etc/apk/repositories && \
     chmod 755 /usr/bin/update.sh && \
 
 # Clean up
-    apk del --purge wget && \
+    apk del --purge aria2 && \
     rm -rf /root/* && \
     rm -rf /tmp/* && \
     rm -rf /var/cache/apk/*