Merge bec64f2306 into 8a59696a5c

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.6 && \
+    git clone https://github.com/t3chn0m4g3/t-pot-attack-map -b 2.2.7 && \
     cd t-pot-attack-map && \
     pip3 install --break-system-packages --upgrade pip && \
     pip3 install --break-system-packages -r requirements.txt && \

docker/sentrypeer/Dockerfile

@@ -1,5 +1,8 @@
 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 \
@@ -8,7 +11,9 @@ RUN apk -U upgrade --no-cache && \
 # Setup user, groups and configs
     mkdir -p /var/log/sentrypeer && \
     addgroup -g 2000 sentrypeer && \
-    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 sentrypeer && \
+    adduser -S -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
@@ -18,4 +23,5 @@ 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

@@ -0,0 +1,3 @@
+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: "dtagdevsec/sentrypeer:24.04"
+    image: "ghcr.io/telekom-security/sentrypeer:testing"
     read_only: true
     volumes:
      - $HOME/tpotce/data/sentrypeer/log:/var/log/sentrypeer

update.sh

@@ -188,6 +188,10 @@ function fuRESTORE () {
 	fi
 	echo "### Restoring T-Pot config file .env"
 	tar xvf $myARCHIVE .env -C $HOME/tpotce >/dev/null 2>&1
+	# Backup file (.env) contains a record of the TPOT_VERSION that is used in docker-compose commmands. 
+	# We should upgrade the version in this file after restoring the backup.
+	newVERSION=$(cat version)
+	sed -i 's/^TPOT_VERSION=.*/TPOT_VERSION=${newVERSION}/' $HOME/tpotce/.env
 }
 
 ################