Merge bec64f2306 into 6933ee0065

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 multiarch/qemu-user-static --reset -p yes > /dev/null 2>&1; then
+if docker run --rm --privileged tonistiigi/binfmt --install all > /dev/null 2>&1; then
     echo -e " [${GREEN}OK${NC}]"
 else
     echo -e " [${RED}FAIL${NC}]"

docker/_builder/setup_builder.sh

@@ -19,8 +19,7 @@ fi
 if [ "$1" != "-y" ]; then
     echo "### Setting up Docker for Multi-Arch Builds."
     echo "### Requires Docker packages from https://get.docker.com/"
-    echo "### Use on x64 only!"
-    echo "### Run with -y if you fit the requirements!"
+    echo "### Run with -y if you meet the requirements!"
     exit 0
 fi
 
@@ -42,7 +41,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 multiarch/qemu-user-static --reset -p yes >/dev/null 2>&1; then
+if docker run --rm --privileged tonistiigi/binfmt --install all >/dev/null 2>&1; then
     echo -e " [${GREEN}OK${NC}]"
 else
     echo -e " [${RED}FAIL${NC}]"
@@ -95,5 +94,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 run --rm --privileged multiarch/qemu-user-static --reset -p yes"
+echo "    docker buildx rm mybuilder && docker run --rm --privileged tonistiigi/binfmt --install all"
 echo

docker/elk/elasticsearch/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND noninteractive
-ENV ES_VER=8.18.1
+ENV ES_VER=8.18.2
 #
 # 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.1
+ENV KB_VER=8.18.2
 #
 # 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.1
+ENV LS_VER=8.18.2
 #
 # Include dist
 COPY dist/ /root/dist/

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
 }
 
 ################