From 80d9efa72936ead8d55c5ca301f9372d30a6265f Mon Sep 17 00:00:00 2001 From: t3chn0m4g3 Date: Fri, 12 Feb 2021 13:54:42 +0000 Subject: [PATCH] bump elk stack images to alpine 3.13 --- docker/elk/elasticsearch/Dockerfile | 6 +++--- docker/elk/head/Dockerfile | 5 ++--- docker/elk/kibana/Dockerfile | 4 ++-- docker/elk/logstash/Dockerfile | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile index 73ac5b0e..3dec2ae8 100644 --- a/docker/elk/elasticsearch/Dockerfile +++ b/docker/elk/elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.13 # # VARS ENV ES_VER=7.11.0 \ @@ -7,8 +7,8 @@ ENV ES_VER=7.11.0 \ 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 \ curl \ diff --git a/docker/elk/head/Dockerfile b/docker/elk/head/Dockerfile index 83399b97..73f98bc2 100644 --- a/docker/elk/head/Dockerfile +++ b/docker/elk/head/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.13 # # Setup env and apt RUN apk -U add \ @@ -11,8 +11,7 @@ RUN apk -U add \ mkdir -p /usr/src/app/ && \ cd /usr/src/app/ && \ git clone https://github.com/mobz/elasticsearch-head . && \ -# git checkout d0a25608854479f0b3f2dca24e8039a2fd66b0e2 && \ - git checkout 2932af571b84017f87bc1c5beee5b6dfbf11b0a5 && \ + git checkout 2d51fecac2980d350fcd3319fd9fe2999f63c9db && \ npm install http-server && \ sed -i "s#\"http\:\/\/localhost\:9200\"#window.location.protocol \+ \'\/\/\' \+ window.location.hostname \+ \'\:\' \+ window.location.port \+ \'\/es\/\'#" /usr/src/app/_site/app.js && \ # diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile index c8e69db3..12871dc0 100644 --- a/docker/elk/kibana/Dockerfile +++ b/docker/elk/kibana/Dockerfile @@ -7,8 +7,8 @@ ENV KB_VER=7.11.0 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 \ curl \ gcompat && \ diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile index 1ac21f94..7d8e1f8b 100644 --- a/docker/elk/logstash/Dockerfile +++ b/docker/elk/logstash/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.13 # # VARS ENV LS_VER=7.11.0 @@ -6,8 +6,8 @@ ENV LS_VER=7.11.0 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 \