tweaking, cleanup

docker/elk/elasticsearch/Dockerfile

@@ -7,6 +7,7 @@ COPY dist/ /root/dist/
 #
 # Install packages
 RUN	apt-get update -y && \
+    apt-get upgrade -y && \
     apt-get install -y \
 			adduser \
             aria2 \
@@ -18,16 +19,12 @@ RUN	apt-get update -y && \
       if [ "$ARCH" = "aarch64" ]; then ES_ARCH="arm64"; fi && \
     echo "$ARCH" && \
     cd /root/dist/ && \
-    mkdir -p /usr/share/elasticsearch/config /etc/elasticsearch && \
+    mkdir -p /usr/share/elasticsearch/config \
+             /etc/elasticsearch && \
     cp elasticsearch.yml /etc/elasticsearch/ && \
     aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VER-$ES_ARCH.deb && \
     dpkg --force-confold -i elasticsearch-$ES_VER-$ES_ARCH.deb && \
 #
-# Add and move files
-#    rm -rf /usr/share/elasticsearch/modules/x-pack-ml && \
-#    mkdir -p /usr/share/elasticsearch/config && \
-#    cp elasticsearch.yml /etc/elasticsearch/ && \
-#
 # Setup user, groups and configs
     groupmod -g 2000 elasticsearch && \
     usermod -u 2000 elasticsearch && \

docker/elk/kibana/Dockerfile

@@ -5,7 +5,8 @@ ENV KB_VER=8.14.2
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
             aria2 \
             curl \
             gcompat && \

docker/elk/logstash/Dockerfile

@@ -7,6 +7,7 @@ COPY dist/ /root/dist/
 #
 # Install packages
 RUN apt-get update -y && \
+    apt-get upgrade -y && \
     apt-get install -y \
     		 adduser \
              aria2 \
@@ -27,7 +28,6 @@ RUN apt-get update -y && \
     cd /root/dist/ && \
     aria2c -s 16 -x 16 https://artifacts.elastic.co/downloads/logstash/logstash-$LS_VER-$LS_ARCH.deb && \
     dpkg -i logstash-$LS_VER-$LS_ARCH.deb && \
-#    /usr/share/logstash/bin/logstash-plugin install logstash-output-gelf logstash-output-syslog && \
 #
 # Add and move files
     cd /root/dist/ && \

docker/elk/map/Dockerfile

@@ -1,7 +1,8 @@
 FROM alpine:3.20
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
 		build-base \
 		git \
 		libcap \
@@ -28,7 +29,8 @@ RUN apk --no-cache -U add \
     apk del --purge build-base \
 		git \
 		python3-dev && \
-    rm -rf /root/* /var/cache/apk/* /opt/t-pot-attack-map/.git
+    rm -rf /root/* /var/cache/apk/* \
+           /opt/t-pot-attack-map/.git
 #
 # Start T-Pot-Attack-Map
 ENV TZ=UTC