From 59cc5c7d382b914f7029087718dfe0ff625b1368 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Thu, 5 Dec 2024 22:39:01 +0100
Subject: [PATCH] housekeeping

---
 docker/go-pot/Dockerfile        |  5 +-
 docker/h0neytr4p/Dockerfile     |  1 +
 docker/hellpot/Dockerfile       |  3 +-
 docker/heralding/Dockerfile     |  5 +-
 docker/honeyaml/Dockerfile      | 11 ++++-
 docker/honeypots/Dockerfile     |  3 +-
 docker/honeypots/Dockerfile.old | 87 ---------------------------------
 docker/honeytrap/Dockerfile     |  3 +-
 docker/ipphoney/Dockerfile      |  4 +-
 docker/ipphoney/Dockerfile.old  | 60 -----------------------
 docker/log4pot/Dockerfile       |  3 +-
 docker/medpot/Dockerfile        |  3 +-
 docker/miniprint/Dockerfile     |  4 +-
 docker/nginx/Dockerfile         |  3 +-
 docker/p0f/Dockerfile           |  3 +-
 docker/redishoneypot/Dockerfile |  3 +-
 docker/spiderfoot/Dockerfile    |  3 +-
 17 files changed, 39 insertions(+), 165 deletions(-)
 delete mode 100644 docker/honeypots/Dockerfile.old
 delete mode 100644 docker/ipphoney/Dockerfile.old

diff --git a/docker/go-pot/Dockerfile b/docker/go-pot/Dockerfile
index 5f410c61..d22d88f8 100644
--- a/docker/go-pot/Dockerfile
+++ b/docker/go-pot/Dockerfile
@@ -1,11 +1,12 @@
 FROM golang:1.23-alpine AS builder
 RUN <<EOF
+apk -U upgrade
 apk -U add git
 mkdir -p /opt
 cd /opt
-git clone https://github.com/ryanolee/go-pot
+git clone https://github.com/t3chn0m4g3/go-pot
 cd go-pot
-git checkout fbb3e66e454e5f6092b4294a52e2cfa44e5b7259
+git checkout 75a2cae856642fdccf3e9d47d0733cf4190ba70b
 EOF
 WORKDIR /opt/go-pot
 #
diff --git a/docker/h0neytr4p/Dockerfile b/docker/h0neytr4p/Dockerfile
index b4b3af5a..a8b3c082 100644
--- a/docker/h0neytr4p/Dockerfile
+++ b/docker/h0neytr4p/Dockerfile
@@ -1,6 +1,7 @@
 FROM golang:1.23-alpine AS builder
 WORKDIR /app
 #
+RUN apk -U upgrade
 RUN apk -U add git openssl
 RUN git clone https://github.com/t3chn0m4g3/h0neytr4p -b v0.33 /app
 RUN go mod download
diff --git a/docker/hellpot/Dockerfile b/docker/hellpot/Dockerfile
index e4798793..4246f3fe 100644
--- a/docker/hellpot/Dockerfile
+++ b/docker/hellpot/Dockerfile
@@ -4,7 +4,8 @@ FROM golang:1.23-alpine AS builder
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
 		build-base \
 		git \
 		g++ && \
diff --git a/docker/heralding/Dockerfile b/docker/heralding/Dockerfile
index b9f94cd8..b073d5bc 100644
--- a/docker/heralding/Dockerfile
+++ b/docker/heralding/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.20
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+	apk --no-cache -U add \
 		build-base \
 		git \
 		libcap \
@@ -34,7 +35,7 @@ RUN apk --no-cache -U add \
     cd heralding && \
     git checkout ac12724ab38c4e2fe78f07d1bc35e6e586ba69c0 && \
     cp /root/dist/requirements.txt . && \
-    pip3 install --break-system-packages --upgrade pip && \
+    pip3 install --break-system-packages --no-cache-dir --upgrade pip && \
     pip3 install --break-system-packages --no-cache-dir -r requirements.txt && \
     pip3 install --break-system-packages --no-cache-dir . && \
 #
diff --git a/docker/honeyaml/Dockerfile b/docker/honeyaml/Dockerfile
index 6ecc25c7..12f78caf 100644
--- a/docker/honeyaml/Dockerfile
+++ b/docker/honeyaml/Dockerfile
@@ -1,8 +1,15 @@
 FROM rust:latest AS builder
 #
-RUN apt update && apt install -y git musl-tools musl-dev libzstd-dev
+RUN apt update && \
+    apt upgrade -y && \
+    apt install -y git \
+                    musl-tools \
+                    musl-dev \
+                    libzstd-dev
 RUN update-ca-certificates
-RUN git clone https://github.com/t3chn0m4g3/honeyaml /opt/honeyaml
+RUN git clone https://github.com/t3chn0m4g3/honeyaml /opt/honeyaml && \
+    cd /opt/honeyaml && \
+    git checkout 9648c27bb31ad554ccabfdd9aeb77028219f24b0
 #
 WORKDIR /opt/honeyaml
 # Need to dynamically link, otherwise multi platform builds are breaking with zstd-sys
diff --git a/docker/honeypots/Dockerfile b/docker/honeypots/Dockerfile
index 2e8c6d04..e2f1b4d4 100644
--- a/docker/honeypots/Dockerfile
+++ b/docker/honeypots/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.20
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+	apk --no-cache -U add \
 		build-base \
 		freetds \
 		freetds-dev \
diff --git a/docker/honeypots/Dockerfile.old b/docker/honeypots/Dockerfile.old
deleted file mode 100644
index 9cd23a44..00000000
--- a/docker/honeypots/Dockerfile.old
+++ /dev/null
@@ -1,87 +0,0 @@
-FROM alpine:3.20
-#
-# Include dist
-COPY dist/ /root/dist/
-#
-# Install packages
-RUN apk --no-cache -U add \
-		build-base \
-		freetds \
-		freetds-dev \
-		gcc \
-		git \
-		hiredis \
-		jpeg-dev \
-		libcap \
-		libffi-dev \
-		libpq \
-		musl-dev \
-		openssl \
-		openssl-dev \
-		postgresql-dev \
-		py3-chardet \
-		py3-click \
-		py3-cryptography \
-		py3-dnspython \
-		py3-flask \
-		py3-future \
-		py3-hiredis \
-		py3-impacket \
-		py3-itsdangerous \
-		py3-jinja2 \
-		py3-ldap3 \
-		py3-markupsafe \
-		py3-netifaces \
-		py3-openssl \
-		py3-packaging \
-		py3-paramiko \
-		py3-pip \
-		# py3-psutil \
-		py3-psycopg2 \
-		py3-pycryptodomex \
-		py3-requests \
-		py3-service_identity \
-		py3-twisted \
-		py3-werkzeug \
-		py3-wheel \
-		python3 \
-		python3-dev \
-		zlib-dev && \
-#	     
-# Install honeypots from GitHub and setup
-    mkdir -p /opt \
-             /var/log/honeypots && \
-    cd /opt/ && \
-    git clone https://github.com/qeeqbox/honeypots && \
-    cd honeypots && \
-    git checkout 7283529c1773c6fc26e072fa9c78074d66fe9fa6 && \
-    pip3 install --break-system-packages --upgrade pip && \
-    pip3 install --break-system-packages . && \
-    setcap cap_net_bind_service=+ep $(readlink -f $(type -P python3)) && \
-#
-# Setup user, groups and configs
-    addgroup -g 2000 honeypots && \
-    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 honeypots && \
-    chown honeypots:honeypots -R /opt/honeypots && \
-    chown honeypots:honeypots -R /var/log/honeypots && \
-    mv /root/dist/config.json /opt/honeypots/ && \
-#
-# Clean up
-    apk del --purge build-base \
-		freetds-dev \
-		git \
-		jpeg-dev \
-		libffi-dev \
-		openssl-dev \
-		postgresql-dev \
-		python3-dev \
-		zlib-dev && \
-	rm -rf /root/* \
-			/var/cache/apk/* \
-			/opt/honeypots/.git
-#
-# Start honeypots 
-STOPSIGNAL SIGINT
-USER honeypots:honeypots
-WORKDIR /opt/honeypots/
-CMD python3 -E -m honeypots --setup all --config config.json
diff --git a/docker/honeytrap/Dockerfile b/docker/honeytrap/Dockerfile
index 2a81101b..94e007eb 100644
--- a/docker/honeytrap/Dockerfile
+++ b/docker/honeytrap/Dockerfile
@@ -6,7 +6,7 @@ COPY dist/ /root/dist/
 #
 # Install packages
 RUN apt-get update && \
-    apt-get -y dist-upgrade && \
+    apt-get -y upgrade && \
 #
 # Install packages
     apt-get install -y autoconf \
@@ -28,6 +28,7 @@ RUN apt-get update && \
 # Install honeytrap from source
     git clone https://github.com/t3chn0m4g3/honeytrap /root/honeytrap && \
     cd /root/honeytrap/ && \
+    git checkout 9b63a5452ed3d5004ca714a7965218c25226a504 && \
     autoreconf -vfi && \
     ./configure \
       --with-stream-mon=nfq \
diff --git a/docker/ipphoney/Dockerfile b/docker/ipphoney/Dockerfile
index cd458d18..8d88ab40 100644
--- a/docker/ipphoney/Dockerfile
+++ b/docker/ipphoney/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.20 AS builder
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+	apk --no-cache -U add \
 		build-base \
 		ca-certificates \
 		git \
@@ -45,6 +46,7 @@ RUN pyinstaller ipphoney.py \
 		--hidden-import output_plugins.jsonlog
 #
 FROM alpine:3.20
+RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/ipphoney/dist/ /opt/
 COPY --from=builder /opt/ipphoney/responses/ /opt/ipphoney/responses/
 COPY dist/honeypot.cfg /opt/ipphoney/etc/
diff --git a/docker/ipphoney/Dockerfile.old b/docker/ipphoney/Dockerfile.old
deleted file mode 100644
index 6833c1d9..00000000
--- a/docker/ipphoney/Dockerfile.old
+++ /dev/null
@@ -1,60 +0,0 @@
-FROM alpine:3.19
-#
-# Include dist
-COPY dist/ /root/dist/
-#
-# Install packages
-RUN apk --no-cache -U add \
-		build-base \
-		ca-certificates \
-		git \
-		libcap \
-		libffi-dev \
-		openssl \
-		openssl-dev \
-		postgresql-dev \
-		py3-cryptography \
-		py3-elasticsearch \
-		py3-geoip2 \
-		py3-maxminddb \
-		py3-mysqlclient \
-		py3-requests \
-		py3-packaging \
-		py3-pip \
-		py3-psycopg2 \
-		py3-redis \
-		py3-requests \
-		py3-service_identity \
-		py3-setuptools \
-		py3-twisted \
-		py3-wheel \
-		python3 \
-		python3-dev && \
-    mkdir -p /opt && \
-    cd /opt/ && \
-    git clone https://gitlab.com/bontchev/ipphoney.git/ && \
-    cd ipphoney && \
-    git checkout 7ab1cac437baba17cb2cd25d5bb1400327e1bb79 && \
-    cp /root/dist/requirements.txt . && \
-    pip3 install --break-system-packages -r requirements.txt && \
-    setcap cap_net_bind_service=+ep $(readlink -f $(type -P python3)) && \
-#
-# Setup user, groups and configs
-    addgroup -g 2000 ipphoney && \
-    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 ipphoney && \
-    mv /root/dist/honeypot.cfg /opt/ipphoney/etc/ && \
-#
-# Clean up
-    apk del --purge build-base \
-                    git \
-                    libffi-dev \
-		    openssl-dev \
-		    postgresql-dev \
-		    python3-dev && \
-    rm -rf /root/* /var/cache/apk/* /opt/ipphoney/.git
-#
-# Start ipphoney
-STOPSIGNAL SIGINT
-USER ipphoney:ipphoney
-WORKDIR /opt/ipphoney/
-CMD ["/usr/bin/python3","ipphoney.py"]
diff --git a/docker/log4pot/Dockerfile b/docker/log4pot/Dockerfile
index 43adf0ba..56a9c6c2 100644
--- a/docker/log4pot/Dockerfile
+++ b/docker/log4pot/Dockerfile
@@ -3,6 +3,7 @@ ENV DEBIAN_FRONTEND noninteractive
 #
 # Install packages
 RUN apt-get update -y && \
+	apt-get upgrade -y && \
     apt-get install -y \
 		build-essential \
 		cargo \
@@ -27,11 +28,9 @@ RUN apt-get update -y && \
     mkdir -p /opt /var/log/log4pot && \
     cd /opt/ && \
     git clone https://github.com/thomaspatzke/Log4Pot && \
-	#git clone https://github.com/t3chn0m4g3/Log4Pot && \
     cd Log4Pot && \
     git checkout 5002b1fe0f82359ef32dbc3a899e8a701dc3256e && \
     sed -i 's#"type": logtype,#"reason": logtype,#g' log4pot-server.py && \
-	# rm poetry.lock && \
 	poetry --no-cache install && \
 	setcap cap_net_bind_service=+ep $(readlink -f $(which python3)) && \
 #
diff --git a/docker/medpot/Dockerfile b/docker/medpot/Dockerfile
index 4e3082df..5e9dfe9c 100644
--- a/docker/medpot/Dockerfile
+++ b/docker/medpot/Dockerfile
@@ -5,7 +5,8 @@ ENV GO111MODULE=on \
     GOOS=linux
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
         build-base \
         git \
         g++
diff --git a/docker/miniprint/Dockerfile b/docker/miniprint/Dockerfile
index 8c5c1a41..5e0ed702 100644
--- a/docker/miniprint/Dockerfile
+++ b/docker/miniprint/Dockerfile
@@ -1,7 +1,8 @@
 FROM alpine:3.20 AS builder
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+	apk --no-cache -U add \
 	build-base \
 	git \	
 	python3 \
@@ -18,6 +19,7 @@ RUN pyinstaller server.py \
 		--add-data "./uploads:./uploads"
 #
 FROM alpine:3.20
+RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/miniprint/dist/* /opt/miniprint/
 COPY --from=builder /opt/miniprint/fake-files/ /opt/miniprint/fake-files/
 COPY --from=builder /opt/miniprint/uploads/ /opt/miniprint/uploads/
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index 2a8a83b3..4fcfd1f5 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.20
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
       nginx \
       nginx-mod-http-brotli \
       nginx-mod-http-headers-more \
diff --git a/docker/p0f/Dockerfile b/docker/p0f/Dockerfile
index 6c3f69fa..bb4d8bdb 100644
--- a/docker/p0f/Dockerfile
+++ b/docker/p0f/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.20
 COPY . /opt/p0f
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
 		bash \
 		build-base \
 		jansson \
diff --git a/docker/redishoneypot/Dockerfile b/docker/redishoneypot/Dockerfile
index 20071b87..0e10e0f6 100644
--- a/docker/redishoneypot/Dockerfile
+++ b/docker/redishoneypot/Dockerfile
@@ -4,7 +4,8 @@ FROM golang:1.23-alpine as builder
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+    apk --no-cache -U add \
 		build-base \
 		git \
 		go \
diff --git a/docker/spiderfoot/Dockerfile b/docker/spiderfoot/Dockerfile
index 813e3d36..2a948c39 100644
--- a/docker/spiderfoot/Dockerfile
+++ b/docker/spiderfoot/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.20
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+	apk --no-cache -U add \
 		build-base \
 		curl \
 		git \