diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile index 71204e1c..0234cfe1 100644 --- a/docker/elk/elasticsearch/Dockerfile +++ b/docker/elk/elasticsearch/Dockerfile @@ -4,7 +4,7 @@ FROM alpine ADD dist/ /root/dist/ # Setup env and apt -RUN apk -U --no-cache add \ +RUN apk -U add \ bash \ curl \ openjdk8-jre \ @@ -13,8 +13,8 @@ RUN apk -U --no-cache add \ # Get and install packages cd /root/dist/ && \ mkdir -p /usr/share/elasticsearch/ && \ - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.4.3.tar.gz && \ - tar xvfz elasticsearch-6.4.3.tar.gz --strip-components=1 -C /usr/share/elasticsearch/ && \ + wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.5.1.tar.gz && \ + tar xvfz elasticsearch-6.5.1.tar.gz --strip-components=1 -C /usr/share/elasticsearch/ && \ # Add and move files cd /root/dist/ && \ @@ -29,7 +29,9 @@ RUN apk -U --no-cache add \ # Clean up apk del --purge wget && \ - rm -rf /root/* + rm -rf /root/* && \ + rm -rf /tmp/* && \ + rm -rf /var/cache/apk/* # Healthcheck HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9200/_cat/health' diff --git a/docker/elk/head/Dockerfile b/docker/elk/head/Dockerfile index bb7c7e6a..68120c5c 100644 --- a/docker/elk/head/Dockerfile +++ b/docker/elk/head/Dockerfile @@ -1,11 +1,11 @@ FROM alpine # Setup env and apt -RUN apk -U --no-cache add \ - curl \ - git \ - nodejs \ - nodejs-npm && \ +RUN apk -U add \ + curl \ + git \ + nodejs \ + nodejs-npm && \ # Get and install packages mkdir -p /usr/src/app/ && \ @@ -20,7 +20,10 @@ RUN apk -U --no-cache add \ chown -R head:head /usr/src/app/ && \ # Clean up - apk del --purge git + apk del --purge git && \ + rm -rf /root/* && \ + rm -rf /tmp/* && \ + rm -rf /var/cache/apk/* # Healthcheck HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9100' diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile index e956d048..c77e4d71 100644 --- a/docker/elk/kibana/Dockerfile +++ b/docker/elk/kibana/Dockerfile @@ -4,7 +4,7 @@ FROM alpine ADD dist/ /root/dist/ # Setup env and apt -RUN apk -U --no-cache add \ +RUN apk -U add \ curl \ nodejs \ wget && \ @@ -12,14 +12,12 @@ RUN apk -U --no-cache add \ # Get and install packages cd /root/dist/ && \ mkdir -p /usr/share/kibana/ && \ - wget https://artifacts.elastic.co/downloads/kibana/kibana-6.4.3-linux-x86_64.tar.gz && \ - tar xvfz kibana-6.4.3-linux-x86_64.tar.gz --strip-components=1 -C /usr/share/kibana/ && \ + wget https://artifacts.elastic.co/downloads/kibana/kibana-6.5.1-linux-x86_64.tar.gz && \ + tar xvfz kibana-6.5.1-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 && \ - rm /usr/share/kibana/node/bin/npm && \ ln -s /usr/bin/node /usr/share/kibana/node/bin/node && \ - ln -s /usr/bin/npm /usr/share/kibana/node/bin/npm && \ # Add and move files cd /root/dist/ && \ @@ -45,17 +43,23 @@ RUN apk -U --no-cache add \ sed -i 's/#server.host: "localhost"/server.host: "0.0.0.0"/' /usr/share/kibana/config/kibana.yml && \ sed -i 's/#elasticsearch.url: "http:\/\/localhost:9200"/elasticsearch.url: "http:\/\/elasticsearch:9200"/' /usr/share/kibana/config/kibana.yml && \ sed -i "s/#005571/#e20074/g" /usr/share/kibana/src/ui/public/chrome/directives/global_nav/global_nav.less && \ - sed -i "s/#005571/#e20074/g" /usr/share/kibana/src/core_plugins/kibana/public/dashboard/styles/index.less && \ sed -i "s/globalColorBlue/globalColorMagenta/g" /usr/share/kibana/src/ui/public/chrome/directives/global_nav/global_nav_link/global_nav_link.less && \ echo "@globalColorMagenta: #9E0051;" >> /usr/share/kibana/src/ui/public/styles/variables/colors.less && \ - /usr/share/kibana/bin/kibana 2>&1 | grep -m 1 "Optimization of bundles" && \ + echo "xpack.infra.enabled: false" >> /usr/share/kibana/config/kibana.yml && \ + echo "xpack.logstash.enabled: false" >> /usr/share/kibana/config/kibana.yml && \ + echo "xpack.canvas.enabled: false" >> /usr/share/kibana/config/kibana.yml && \ + echo "xpack.spaces.enabled: false" >> /usr/share/kibana/config/kibana.yml && \ + echo "xpack.apm.enabled: false" >> /usr/share/kibana/config/kibana.yml && \ + /usr/share/kibana/bin/kibana --optimize && \ addgroup -g 2000 kibana && \ adduser -S -H -s /bin/ash -u 2000 -D -g 2000 kibana && \ chown -R kibana:kibana /usr/share/kibana/ && \ # Clean up apk del --purge wget && \ - rm -rf /root/* + rm -rf /root/* && \ + rm -rf /tmp/* && \ + rm -rf /var/cache/apk/* # Healthcheck HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:5601' diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile index 40318b3e..c1102873 100644 --- a/docker/elk/logstash/Dockerfile +++ b/docker/elk/logstash/Dockerfile @@ -4,22 +4,22 @@ FROM alpine ADD dist/ /root/dist/ # Setup env and apt -RUN apk -U --no-cache add \ - bash \ - curl \ - git \ - libc6-compat \ - libzmq \ - openjdk8-jre \ - wget && \ +RUN apk -U add \ + bash \ + curl \ + git \ + libc6-compat \ + libzmq \ + openjdk8-jre \ + wget && \ # 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.4.3.tar.gz && \ + wget https://artifacts.elastic.co/downloads/logstash/logstash-6.5.1.tar.gz && \ wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz && \ - tar xvfz logstash-6.4.3.tar.gz --strip-components=1 -C /usr/share/logstash/ && \ + tar xvfz logstash-6.5.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-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/ && \ @@ -42,6 +42,7 @@ RUN apk -U --no-cache add \ # Clean up apk del --purge wget && \ rm -rf /root/* && \ + rm -rf /tmp/* && \ rm -rf /var/cache/apk/* # Healthcheck @@ -49,4 +50,4 @@ 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 +CMD update.sh && exec /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf --java-execution