diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile index 88819485..26431d69 100644 --- a/docker/elk/elasticsearch/Dockerfile +++ b/docker/elk/elasticsearch/Dockerfile @@ -1,7 +1,7 @@ FROM alpine # # VARS -ENV ES_VER=7.6.1 \ +ENV ES_VER=7.6.2 \ 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 b549f416..6e4568ce 100644 --- a/docker/elk/kibana/Dockerfile +++ b/docker/elk/kibana/Dockerfile @@ -1,7 +1,7 @@ FROM node:10.19.0-alpine # # VARS -ENV KB_VER=7.6.1 +ENV KB_VER=7.6.2 # # Include dist ADD dist/ /root/dist/ diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile index abf4e0bf..c4a8d81c 100644 --- a/docker/elk/logstash/Dockerfile +++ b/docker/elk/logstash/Dockerfile @@ -1,7 +1,7 @@ FROM alpine # # VARS -ENV LS_VER=7.6.1 +ENV LS_VER=7.6.2 # Include dist ADD dist/ /root/dist/ # @@ -20,8 +20,8 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \ # Get and install packages mkdir -p /etc/listbot && \ cd /etc/listbot && \ - aria2c -s16 -x 16 https://raw.githubusercontent.com/dtag-dev-sec/listbot/master/cve.yaml.bz2 && \ - aria2c -s16 -x 16 https://raw.githubusercontent.com/dtag-dev-sec/listbot/master/iprep.yaml.bz2 && \ + aria2c -s16 -x 16 https://dtag-dev-sec.netlify.com/cve.yaml.bz2 && \ + aria2c -s16 -x 16 https://dtag-dev-sec.netlify.com/iprep.yaml.bz2 && \ bunzip2 *.bz2 && \ cd /root/dist/ && \ mkdir -p /usr/share/logstash/ && \ @@ -36,7 +36,7 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \ chmod u+x /usr/bin/update.sh && \ mkdir -p /etc/logstash/conf.d && \ cp logstash.conf /etc/logstash/conf.d/ && \ - cp elasticsearch-template-es7x.json /usr/share/logstash/vendor/bundle/jruby/2.5.0/gems/logstash-output-elasticsearch-10.3.1-java/lib/logstash/outputs/elasticsearch/ && \ + cp elasticsearch-template-es7x.json /usr/share/logstash/vendor/bundle/jruby/2.5.0/gems/logstash-output-elasticsearch-10.3.3-java/lib/logstash/outputs/elasticsearch/ && \ # # Setup user, groups and configs addgroup -g 2000 logstash && \ diff --git a/docker/elk/logstash/dist/update.sh b/docker/elk/logstash/dist/update.sh index 55281998..b9bcf272 100644 --- a/docker/elk/logstash/dist/update.sh +++ b/docker/elk/logstash/dist/update.sh @@ -22,13 +22,13 @@ for i in $mySITES; } # Check for connectivity and download latest translation maps -myCHECK=$(fuCHECKINET "raw.githubusercontent.com") +myCHECK=$(fuCHECKINET "dtag-dev-sec.netlify.com") if [ "$myCHECK" == "0" ]; then - echo "Connection to Github looks good, now downloading latest translation maps." + echo "Connection to Netlify looks good, now downloading latest translation maps." cd /etc/listbot - aria2c -s16 -x 16 https://raw.githubusercontent.com/dtag-dev-sec/listbot/master/cve.yaml.bz2 && \ - aria2c -s16 -x 16 https://raw.githubusercontent.com/dtag-dev-sec/listbot/master/iprep.yaml.bz2 && \ + aria2c -s16 -x 16 https://dtag-dev-sec.netlify.com/cve.yaml.bz2 && \ + aria2c -s16 -x 16 https://dtag-dev-sec.netlify.com/iprep.yaml.bz2 && \ bunzip2 -f *.bz2 cd / else