bump elk stack to 6.6.2, replace wget with aria2 to speed up d/l

This commit is contained in:
t3chn0m4g3 2019-03-15 22:23:30 +00:00
parent 5dae44b5e9
commit 573ceb98a1
3 changed files with 25 additions and 21 deletions

View file

@ -4,17 +4,19 @@ FROM alpine
ADD dist/ /root/dist/ ADD dist/ /root/dist/
# Setup env and apt # 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 \ bash \
curl \ curl \
openjdk8-jre \ nss \
wget && \ openjdk8-jre && \
# Get and install packages # Get and install packages
cd /root/dist/ && \ cd /root/dist/ && \
mkdir -p /usr/share/elasticsearch/ && \ mkdir -p /usr/share/elasticsearch/ && \
wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.6.1.tar.gz && \ aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.6.2.tar.gz && \
tar xvfz elasticsearch-6.6.1.tar.gz --strip-components=1 -C /usr/share/elasticsearch/ && \ tar xvfz elasticsearch-6.6.2.tar.gz --strip-components=1 -C /usr/share/elasticsearch/ && \
# Add and move files # Add and move files
cd /root/dist/ && \ cd /root/dist/ && \
@ -28,7 +30,7 @@ RUN apk -U add \
rm -rf /usr/share/elasticsearch/modules/x-pack-ml && \ rm -rf /usr/share/elasticsearch/modules/x-pack-ml && \
# Clean up # Clean up
apk del --purge wget && \ apk del --purge aria2 && \
rm -rf /root/* && \ rm -rf /root/* && \
rm -rf /tmp/* && \ rm -rf /tmp/* && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*

View file

@ -1,18 +1,19 @@
FROM node:10.15.1-alpine FROM node:10.15.2-alpine
# Include dist # Include dist
ADD dist/ /root/dist/ ADD dist/ /root/dist/
# Setup env and apt # Setup env and apt
RUN apk -U add \ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
curl \ apk -U --no-cache add \
wget && \ aria2 \
curl && \
# Get and install packages # Get and install packages
cd /root/dist/ && \ cd /root/dist/ && \
mkdir -p /usr/share/kibana/ && \ mkdir -p /usr/share/kibana/ && \
wget https://artifacts.elastic.co/downloads/kibana/kibana-6.6.1-linux-x86_64.tar.gz && \ 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.1-linux-x86_64.tar.gz --strip-components=1 -C /usr/share/kibana/ && \ 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 # Kibana's bundled node does not work in alpine
rm /usr/share/kibana/node/bin/node && \ rm /usr/share/kibana/node/bin/node && \
@ -47,7 +48,7 @@ RUN apk -U add \
chown -R kibana:kibana /usr/share/kibana/ && \ chown -R kibana:kibana /usr/share/kibana/ && \
# Clean up # Clean up
apk del --purge wget && \ apk del --purge aria2 && \
rm -rf /root/* && \ rm -rf /root/* && \
rm -rf /tmp/* && \ rm -rf /tmp/* && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*

View file

@ -4,26 +4,27 @@ FROM alpine
ADD dist/ /root/dist/ ADD dist/ /root/dist/
# Setup env and apt # 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 \ apk -U --no-cache add \
aria2 \
bash \ bash \
curl \ curl \
git \ git \
libc6-compat \ libc6-compat \
libzmq \ libzmq \
openjdk8-jre \ nss \
wget && \ openjdk8-jre && \
# Get and install packages # Get and install packages
git clone --depth=1 https://github.com/dtag-dev-sec/listbot /etc/listbot && \ git clone --depth=1 https://github.com/dtag-dev-sec/listbot /etc/listbot && \
cd /root/dist/ && \ cd /root/dist/ && \
mkdir -p /usr/share/logstash/ && \ mkdir -p /usr/share/logstash/ && \
wget https://artifacts.elastic.co/downloads/logstash/logstash-6.6.1.tar.gz && \ aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/logstash/logstash-6.6.2.tar.gz && \
wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz && \ tar xvfz logstash-6.6.2.tar.gz --strip-components=1 -C /usr/share/logstash/ && \
tar xvfz logstash-6.6.1.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-filter-translate && \
/usr/share/logstash/bin/logstash-plugin install logstash-output-syslog && \ /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 # Add and move files
cd /root/dist/ && \ 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 && \ chmod 755 /usr/bin/update.sh && \
# Clean up # Clean up
apk del --purge wget && \ apk del --purge aria2 && \
rm -rf /root/* && \ rm -rf /root/* && \
rm -rf /tmp/* && \ rm -rf /tmp/* && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*