Merge 50beeef63a into fd8061eacf

docker/_builder/builder.sh

@@ -132,7 +132,7 @@ fi
 
 # Ensure QEMU is set up for cross-platform builds
 echo -n "Ensuring QEMU is configured for cross-platform builds..."
-if docker run --rm --privileged tonistiigi/binfmt --install all > /dev/null 2>&1; then
+if docker run --rm --privileged multiarch/qemu-user-static --reset -p yes > /dev/null 2>&1; then
     echo -e " [${GREEN}OK${NC}]"
 else
     echo -e " [${RED}FAIL${NC}]"

docker/_builder/setup_builder.sh

@@ -19,7 +19,8 @@ fi
 if [ "$1" != "-y" ]; then
     echo "### Setting up Docker for Multi-Arch Builds."
     echo "### Requires Docker packages from https://get.docker.com/"
-    echo "### Run with -y if you meet the requirements!"
+    echo "### Use on x64 only!"
+    echo "### Run with -y if you fit the requirements!"
     exit 0
 fi
 
@@ -41,7 +42,7 @@ fi
 
 # Ensure QEMU is set up for cross-platform builds
 echo -n "Ensuring QEMU is configured for cross-platform builds..."
-if docker run --rm --privileged tonistiigi/binfmt --install all >/dev/null 2>&1; then
+if docker run --rm --privileged multiarch/qemu-user-static --reset -p yes >/dev/null 2>&1; then
     echo -e " [${GREEN}OK${NC}]"
 else
     echo -e " [${RED}FAIL${NC}]"
@@ -94,5 +95,5 @@ echo "    docker login -u <username>"
 echo "    docker login ghcr.io -u <username>"
 echo
 echo -e "${BLUE}Fix segmentation faults when building arm64 images:${NC}"
-echo "    docker buildx rm mybuilder && docker run --rm --privileged tonistiigi/binfmt --install all"
+echo "    docker run --rm --privileged multiarch/qemu-user-static --reset -p yes"
 echo

docker/elk/elasticsearch/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND noninteractive
-ENV ES_VER=8.18.2
+ENV ES_VER=8.18.1
 #
 # Include dist
 COPY dist/ /root/dist/

docker/elk/kibana/Dockerfile

@@ -1,5 +1,5 @@
 FROM node:20.18.2-alpine3.20
-ENV KB_VER=8.18.2
+ENV KB_VER=8.18.1
 #
 # Include dist
 COPY dist/ /root/dist/

docker/elk/logstash/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND=noninteractive
-ENV LS_VER=8.18.2
+ENV LS_VER=8.18.1
 #
 # Include dist
 COPY dist/ /root/dist/

docker/elk/map/Dockerfile

@@ -14,7 +14,7 @@ RUN apk --no-cache -U upgrade && \
 # Install from GitHub and setup
     mkdir -p /opt && \
     cd /opt/ && \
-    git clone https://github.com/t3chn0m4g3/t-pot-attack-map -b 2.2.7 && \
+    git clone https://github.com/t3chn0m4g3/t-pot-attack-map -b 2.2.6 && \
     cd t-pot-attack-map && \
     pip3 install --break-system-packages --upgrade pip && \
     pip3 install --break-system-packages -r requirements.txt && \

docker/sentrypeer/Dockerfile

@@ -1,8 +1,5 @@
 FROM alpine:edge
 #
-# Include dist
-COPY dist/ /root/dist/
-#
 # Install packages
 RUN apk -U upgrade --no-cache && \
 	apk -U add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
@@ -11,9 +8,7 @@ RUN apk -U upgrade --no-cache && \
 # Setup user, groups and configs
     mkdir -p /var/log/sentrypeer && \
     addgroup -g 2000 sentrypeer && \
-    adduser -S -s /bin/ash -u 2000 -D -g 2000 sentrypeer && \
+    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 sentrypeer && \
-    mkdir -p /home/sentrypeer/.config/sentrypeer && \
-    cp /root/dist/default-config.toml /home/sentrypeer/.config/sentrypeer && \
     chown -R sentrypeer:sentrypeer /usr/bin/sentrypeer && \
 #
 # Clean up
@@ -23,5 +18,4 @@ RUN apk -U upgrade --no-cache && \
 # Set workdir and start sentrypeer
 STOPSIGNAL SIGKILL
 USER sentrypeer:sentrypeer
-WORKDIR /var/log/sentrypeer/
 CMD /usr/bin/sentrypeer -jar -f /var/log/sentrypeer/sentrypeer.db -l /var/log/sentrypeer/sentrypeer.json

docker/sentrypeer/dist/default-config.toml

@@ -1,3 +0,0 @@
-cert = "cert.pem"
-key = "key.pem"
-tls_listen_address = "0.0.0.0:5061"

docker/sentrypeer/docker-compose.yml

@@ -22,7 +22,7 @@ services:
      - "5060:5060/udp"
      - "5060:5060/tcp"
 #     - "127.0.0.1:8082:8082"
-    image: "ghcr.io/telekom-security/sentrypeer:testing"
+    image: "dtagdevsec/sentrypeer:24.04"
     read_only: true
     volumes:
      - $HOME/tpotce/data/sentrypeer/log:/var/log/sentrypeer