docker/adbhoney/Dockerfile

@@ -4,8 +4,7 @@ FROM alpine:3.20 AS builder
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN	apk --no-cache -U upgrade && \
+RUN	apk --no-cache -U add \
-	apk --no-cache -U add \
 		build-base \
 		git \
 		procps \
@@ -18,14 +17,12 @@ RUN	apk --no-cache -U upgrade && \
 # Install adbhoney from git
     git clone https://github.com/t3chn0m4g3/ADBHoney /opt/adbhoney && \
     cd /opt/adbhoney && \
-	git checkout 42a73cd8a82ddd4d137de70ac37b1a8b2e3e0119 && \
     cp /root/dist/adbhoney.cfg /opt/adbhoney && \
     sed -i 's/dst_ip/dest_ip/' /opt/adbhoney/adbhoney/core.py && \
     sed -i 's/dst_port/dest_port/' /opt/adbhoney/adbhoney/core.py && \
     pyinstaller adbhoney.spec
 #
 FROM alpine:3.20
-RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/adbhoney/dist/adbhoney/ /opt/adbhoney/
 #
 # Set workdir and start adbhoney

docker/adbhoney/Dockerfile.old

@@ -0,0 +1,39 @@
+FROM alpine:3.20
+#
+# Include dist
+COPY dist/ /root/dist/
+#
+# Install packages
+RUN	apk --no-cache -U add \
+		git \
+		procps \
+		py3-psutil \
+		py3-requests \
+		python3 && \
+#
+# Install adbhoney from git
+    git clone https://github.com/t3chn0m4g3/ADBHoney /opt/adbhoney && \
+#   cd /opt/adbhoney && \
+#    git checkout 2417a7a982f4fd527b3a048048df9a23178767ad && \
+#   git checkout 42afd98611724ca3d694a48b694c957e8d953db4 && \
+    cp /root/dist/adbhoney.cfg /opt/adbhoney && \
+    cp /root/dist/cpu_check.py / && \
+    sed -i 's/dst_ip/dest_ip/' /opt/adbhoney/adbhoney/core.py && \
+    sed -i 's/dst_port/dest_port/' /opt/adbhoney/adbhoney/core.py && \
+#
+# Setup user, groups and configs
+    addgroup -g 2000 adbhoney && \
+    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 adbhoney && \
+    chown -R adbhoney:adbhoney /opt/adbhoney && \
+#
+# Clean up
+    apk del --purge git && \
+    rm -rf /root/* /opt/adbhoney/.git /var/cache/apk/*
+#
+# Set workdir and start adbhoney
+STOPSIGNAL SIGINT
+# Adbhoney sometimes hangs at 100% CPU usage, if detected container will become unhealthy and restarted by tpotinit
+HEALTHCHECK --interval=5m --timeout=30s --retries=3 CMD python3 /cpu_check.py $(pgrep -of run.py) 99
+USER adbhoney:adbhoney
+WORKDIR /opt/adbhoney/
+CMD ["/usr/bin/python3", "run.py"]

docker/beelzebub/Dockerfile

@@ -10,9 +10,7 @@ RUN apk -U add git
 WORKDIR /root
 #
 # Build beelzebub
-RUN git clone https://github.com/t3chn0m4g3/beelzebub && \
+RUN git clone https://github.com/t3chn0m4g3/beelzebub
-    cd beelzebub && \
-    git checkout 17a0854b8d9d1e41cf5435b5dc85354bbfb9093c
 WORKDIR /root/beelzebub
 RUN go mod download
 RUN go build -o main .

docker/beelzebub/Dockerfile.old

@@ -0,0 +1,39 @@
+FROM golang:1.20-alpine AS builder
+#
+ENV GO111MODULE=on \
+    CGO_ENABLED=0 \
+    GOOS=linux
+#
+# Install packages
+RUN apk -U add git
+#
+WORKDIR /root
+#
+# Build beelzebub
+RUN git clone https://github.com/t3chn0m4g3/beelzebub
+WORKDIR /root/beelzebub
+RUN go mod download
+RUN go build -o main .
+#
+FROM alpine:3.20
+#
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=builder /root/beelzebub/main /opt/beelzebub/
+COPY --from=builder /root/beelzebub/configurations /opt/beelzebub/configurations
+#
+# Setup user, groups and configs
+RUN <<EOF
+sed -i "s#logsPath: ./log#logsPath: ./configurations/log/beelzebub.json#g" /opt/beelzebub/configurations/beelzebub.yaml
+sed -i 's/passwordRegex: "^(root|qwerty|Smoker666|123456|jenkins|minecraft|sinus|alex|postgres|Ly123456)$"/passwordRegex: ".*"/g' /opt/beelzebub/configurations/services/ssh-22.yaml
+addgroup -g 2000 beelzebub
+adduser -S -s /bin/ash -u 2000 -D -g 2000 beelzebub
+mkdir -p /beelzebub/configurations/key \
+         /beelzebub/configurations/log
+chown beelzebub:beelzebub -R /opt/beelzebub/configurations
+chmod 0770 -R /opt/beelzebub/configurations
+EOF
+#
+# Start beelzebub
+WORKDIR /opt/beelzebub
+USER beelzebub:beelzebub
+CMD ["./main"]

docker/ciscoasa/Dockerfile

@@ -1,8 +1,7 @@
 FROM alpine:3.20 AS builder
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-	apk --no-cache -U add \
 		build-base \
 		git \
 		libffi \
@@ -18,7 +17,6 @@ RUN apk --no-cache -U upgrade && \
     cd /opt/ && \
     git clone https://github.com/t3chn0m4g3/ciscoasa_honeypot && \
     cd ciscoasa_honeypot && \
-	git checkout 4bd2795cfa14320a87c00b7159fa3b7d6a8ba254 && \
     sed -i "s/git+git/git+https/g" requirements.txt && \
     pip3 install --break-system-packages pyinstaller && \
     pip3 install --break-system-packages --no-cache-dir -r requirements.txt
@@ -26,7 +24,6 @@ WORKDIR /opt/ciscoasa_honeypot
 RUN pyinstaller asa_server.py --add-data "./asa:./asa"
 #
 FROM alpine:3.20
-RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/ciscoasa_honeypot/dist/ /opt/
 #
 # Start ciscoasa

docker/citrixhoneypot/Dockerfile

@@ -1,13 +1,13 @@
 FROM alpine:3.20 AS builder
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-    apk --no-cache -U add \
         build-base \
 		git \
 		openssl \
 		py3-pip \
 		python3 && \
+#
     pip3 install --break-system-packages --no-cache-dir \
         pyinstaller \
         python-json-logger
@@ -15,7 +15,7 @@ RUN apk --no-cache -U upgrade && \
 # Install CitrixHoneypot from GitHub
 RUN git clone https://github.com/t3chn0m4g3/CitrixHoneypot /opt/citrixhoneypot && \
     cd /opt/citrixhoneypot && \
-    git checkout dee32447033a0296d053e8f881bf190f9dd7ad44 && \
+#
     mkdir -p /opt/citrixhoneypot/logs /opt/citrixhoneypot/ssl && \
     openssl req \
           -nodes \
@@ -31,7 +31,6 @@ WORKDIR /opt/citrixhoneypot
 RUN pyinstaller CitrixHoneypot.py
 #
 FROM alpine:3.20
-RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/citrixhoneypot/dist/CitrixHoneypot/ /opt/citrixhoneypot
 COPY --from=builder /opt/citrixhoneypot/ssl /opt/citrixhoneypot/ssl
 COPY --from=builder /opt/citrixhoneypot/responses/ /opt/citrixhoneypot/responses

docker/conpot/Dockerfile

@@ -4,9 +4,7 @@ FROM alpine:3.19
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add build-base \
-    apk --no-cache -U add \
-            build-base \
 			cython \
 			file \
 			git \
@@ -46,12 +44,12 @@ RUN apk --no-cache -U upgrade && \
 # Setup ConPot
     git clone https://github.com/t3chn0m4g3/cpppo /opt/cpppo && \
     cd /opt/cpppo && \
-    git checkout 350d5187a941e7359c53087dcb1f0e41ece5682c && \
     pip3 install --break-system-packages --no-cache-dir --upgrade pip && \
     pip3 install --break-system-packages --no-cache-dir . && \
     git clone https://github.com/mushorg/conpot /opt/conpot && \
     cd /opt/conpot/ && \
 	git checkout 26c67d11b08a855a28e87abd186d959741f46c7f && \
+    # git checkout b3740505fd26d82473c0d7be405b372fa0f82575 && \
     # Change template default ports if <1024
     sed -i 's/port="2121"/port="21"/' /opt/conpot/conpot/templates/default/ftp/ftp.xml && \
     sed -i 's/port="8800"/port="80"/' /opt/conpot/conpot/templates/default/http/http.xml && \
@@ -92,9 +90,7 @@ RUN apk --no-cache -U upgrade && \
             wget && \
     rm -rf /root/* \
            /tmp/* \
-           /var/cache/apk/* \
+           /var/cache/apk/*
-           /opt/cpppo/.git \
-           /opt/conpot/.git
 #
 # Start conpot
 STOPSIGNAL SIGINT

docker/cowrie/Dockerfile

@@ -4,8 +4,7 @@ FROM alpine:3.20
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-    apk --no-cache -U add \
 		bash \
 		build-base \
 		git \

docker/ddospot/Dockerfile

@@ -4,8 +4,7 @@ FROM alpine:3.20 AS builder
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-    apk --no-cache -U add \
 		build-base \
 		git \
 		py3-colorama \
@@ -23,7 +22,6 @@ RUN apk --no-cache -U upgrade && \
     cd /opt/ && \
     git clone https://github.com/t3chn0m4g3/ddospot && \
     cd ddospot && \
-    git checkout 66b94f3cf56c66e2e26b55feff9e65493cfadf3c && \
     cp /root/dist/requirements.txt . && \
     pip3 install --break-system-packages -r ddospot/requirements.txt && \
     pip3 install --break-system-packages pyinstaller
@@ -53,7 +51,6 @@ RUN pyinstaller ddospot.py \
        --hidden-import OpenSSL.SSL
 #
 FROM alpine:3.20
-RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/ddospot/ddospot/dist/ddospot/ /opt/ddospot/ddospot
 COPY --from=builder /opt/ddospot/ddospot/global.conf /opt/ddospot/ddospot/
 COPY --from=builder /opt/ddospot/ddospot/pots /opt/ddospot/ddospot/pots

docker/ddospot/Dockerfile.old

@@ -0,0 +1,47 @@
+FROM alpine:3.20
+#
+# Include dist
+COPY dist/ /root/dist/
+#
+# Install packages
+RUN apk --no-cache -U add \
+		build-base \
+		git \
+		libcap \
+		py3-colorama \
+		py3-greenlet \
+		py3-pip \
+		py3-schedule \
+		py3-sqlalchemy \
+		py3-twisted \
+		py3-wheel \
+		python3 \
+		python3-dev && \
+#	     
+# Install ddospot from GitHub and setup
+    mkdir -p /opt && \
+    cd /opt/ && \
+    git clone https://github.com/t3chn0m4g3/ddospot -b test && \
+    cd ddospot && \
+    cp /root/dist/requirements.txt . && \
+    pip3 install --break-system-packages -r ddospot/requirements.txt && \
+    setcap cap_net_bind_service=+ep $(readlink -f $(type -P python3)) && \
+#
+# Setup user, groups and configs
+    addgroup -g 2000 ddospot && \
+    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 ddospot && \
+    chown ddospot:ddospot -R /opt/ddospot && \
+#
+# Clean up
+    apk del --purge build-base \
+			git \
+			python3-dev && \
+    rm -rf /root/* \
+            /opt/ddospot/.git \
+            /var/cache/apk/*
+#
+# Start ddospot
+STOPSIGNAL SIGINT
+USER ddospot:ddospot
+WORKDIR /opt/ddospot/ddospot/
+CMD ["/usr/bin/python3","ddospot.py", "-n"]

docker/dionaea/Dockerfile

@@ -4,6 +4,7 @@ ENV DEBIAN_FRONTEND noninteractive
 # Include dist
 COPY dist/ /root/dist/
 #
+
 # Determine arch, get and install packages
 RUN ARCH=$(arch) && \
       if [ "$ARCH" = "x86_64" ]; then ARCH="amd64"; fi && \
@@ -12,11 +13,10 @@ RUN ARCH=$(arch) && \
     cd /root/dist/ && \
 # Setup apt
     apt-get update -y && \
-    apt-get upgrade -y && \
     apt-get install wget -y && \
     wget http://ftp.us.debian.org/debian/pool/main/libe/libemu/libemu2_0.2.0+git20120122-1.2+b1_$ARCH.deb \
          http://ftp.us.debian.org/debian/pool/main/libe/libemu/libemu-dev_0.2.0+git20120122-1.2+b1_$ARCH.deb && \
-    apt-get install ./libemu2_0.2.0+git20120122-1.2+b1_$ARCH.deb \
+    apt install ./libemu2_0.2.0+git20120122-1.2+b1_$ARCH.deb \
                 ./libemu-dev_0.2.0+git20120122-1.2+b1_$ARCH.deb -y && \
     apt-get install -y --no-install-recommends \
 		build-essential \

docker/elasticpot/Dockerfile

@@ -4,8 +4,7 @@ FROM alpine:3.20 AS builder
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-	apk --no-cache -U add \
 		build-base \
 		ca-certificates \
 		git \
@@ -43,7 +42,6 @@ RUN pyinstaller elasticpot.py \
 		--hidden-import output_plugins.jsonlog
 #
 FROM alpine:3.20
-RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/elasticpot/dist/ /opt/
 COPY --from=builder /opt/elasticpot/responses/ /opt/elasticpot/responses/
 COPY --from=builder /root/dist/honeypot.cfg /opt/elasticpot/etc/

docker/elk/elasticsearch/Dockerfile

@@ -7,7 +7,6 @@ COPY dist/ /root/dist/
 #
 # Install packages
 RUN	apt-get update -y && \
-    apt-get upgrade -y && \
     apt-get install -y \
 			adduser \
             aria2 \
@@ -19,12 +18,16 @@ RUN	apt-get update -y && \
       if [ "$ARCH" = "aarch64" ]; then ES_ARCH="arm64"; fi && \
     echo "$ARCH" && \
     cd /root/dist/ && \
-    mkdir -p /usr/share/elasticsearch/config \
+    mkdir -p /usr/share/elasticsearch/config /etc/elasticsearch && \
-             /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,8 +5,7 @@ ENV KB_VER=8.14.2
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-    apk --no-cache -U add \
             aria2 \
             curl \
             gcompat && \

docker/elk/logstash/Dockerfile

@@ -7,7 +7,6 @@ COPY dist/ /root/dist/
 #
 # Install packages
 RUN apt-get update -y && \
-    apt-get upgrade -y && \
     apt-get install -y \
     		 adduser \
              aria2 \
@@ -28,6 +27,7 @@ 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,8 +1,7 @@
 FROM alpine:3.20
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-    apk --no-cache -U add \
 		build-base \
 		git \
 		libcap \
@@ -29,8 +28,7 @@ RUN apk --no-cache -U upgrade && \
     apk del --purge build-base \
 		git \
 		python3-dev && \
-    rm -rf /root/* /var/cache/apk/* \
+    rm -rf /root/* /var/cache/apk/* /opt/t-pot-attack-map/.git
-           /opt/t-pot-attack-map/.git
 #
 # Start T-Pot-Attack-Map
 ENV TZ=UTC

docker/endlessh/Dockerfile

@@ -17,7 +17,7 @@ RUN apk -U add --no-cache \
     mv /opt/endlessh/endlessh /root/dist
 #
 FROM alpine:3.20
-RUN apk --no-cache -U upgrade
+#
 COPY --from=builder /root/dist/* /opt/endlessh/
 #
 STOPSIGNAL SIGINT

docker/ewsposter/Dockerfile

@@ -4,8 +4,7 @@ FROM alpine:3.19
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-	apk --no-cache -U add \
 		build-base \
 		git \
 		libffi-dev \
@@ -24,12 +23,7 @@ RUN apk --no-cache -U upgrade && \
 		py3-setuptools \
 		py3-wheel && \
 	pip3 install --break-system-packages --upgrade pip && \
-	pip3 install --break-system-packages --no-cache-dir \
+	pip3 install --break-system-packages --no-cache-dir configparser hpfeeds3 influxdb influxdb-client xmljson && \
-			configparser \
-			hpfeeds3 \
-			influxdb \
-			influxdb-client \
-			xmljson && \
 #
 # Setup ewsposter
     git clone https://github.com/telekom-security/ewsposter -b v1.25.0 /opt/ewsposter && \

docker/fatt/Dockerfile

@@ -1,8 +1,7 @@
 FROM alpine:3.20
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-    apk --no-cache -U add \
 		git \
 		libcap \
 		py3-libxml2 \
@@ -23,7 +22,7 @@ RUN apk --no-cache -U upgrade && \
     cd fatt && \
     git checkout c29e553514281e50781f86932b82337a5ada5640 && \
     mkdir -p log && \
-    pip3 install --no-cache-dir --break-system-packages pyshark && \
+    pip3 install --break-system-packages pyshark && \
 #
 # Setup configs
     chgrp fatt /usr/bin/dumpcap && \

docker/fatt/docker-compose.yml

@@ -4,8 +4,6 @@ services:
   fatt:
     build: .
     container_name: fatt
-    stdin_open: true
-    tty: true
     restart: always
 #    cpu_count: 1
 #    cpus: 0.75

docker/galah/Dockerfile

@@ -1,12 +1,9 @@
 FROM golang:1.23-alpine AS builder
 RUN <<EOF
-apk --no-cache -U upgrade
+apk -U add build-base git
-apk --no-cache -U add build-base git
 mkdir -p /opt
 cd /opt
 git clone https://github.com/t3chn0m4g3/galah
-cd galah
-git checkout d4739ec5abaed83c5367716a77908be548d3d003
 EOF
 WORKDIR /opt/galah
 ENV CGO_ENABLED=1
@@ -16,7 +13,6 @@ go build -o galah ./cmd/galah
 EOF
 #
 FROM alpine:3.20
-RUN apk --no-cache -U upgrade
 COPY --from=builder /opt/galah/ /opt/galah/
 #
 # Start galah

docker/glutton/Dockerfile

@@ -4,8 +4,7 @@ FROM golang:1.23-alpine AS builder
 COPY dist/ /root/dist/
 # 
 # Setup apk
-RUN apk --no-cache -U upgrade && \
+RUN apk -U --no-cache add \
-	apk -U --no-cache add \
 		make \
   		git \
 		g++ \

docker/tanner/phpox/Dockerfile

@@ -1,8 +1,7 @@
-FROM alpine:3.20
+FROM alpine:3.19
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-    apk --no-cache -U add \
 		build-base \
 		file \
 		git \
@@ -17,6 +16,7 @@ RUN apk --no-cache -U upgrade && \
 # Install bfr sandbox from git
     git clone https://github.com/mushorg/BFR -b v1.0.0 /opt/BFR && \
     cd /opt/BFR && \
+#    git checkout 91a8a4e155875c50b69d5c6af454e304994815a7 && \
     phpize83 && \
     ./configure \
       --with-php-config=/usr/bin/php-config83 \
@@ -30,7 +30,7 @@ RUN apk --no-cache -U upgrade && \
 # Install PHP Sandbox
     git clone https://github.com/mushorg/phpox /opt/phpox && \
     cd /opt/phpox && \
-    git checkout 55a6cbdc2c62f08eb45acffaf84f23f06a1d4703 && \
+    #git checkout a62c8136ec7b3ebab0c989f4235e2960175121f8 && \
     make && \
 #
 # Clean up

docker/tanner/redis/Dockerfile

@@ -1,11 +1,10 @@
-FROM alpine:3.20
+FROM alpine:3.19
 #
 # Include dist
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add redis shadow && \
-    apk --no-cache -U add redis shadow && \
     cp /root/dist/redis.conf /etc && \
 #
 # Setup user and group

docker/tanner/snare/Dockerfile

@@ -4,8 +4,7 @@ FROM alpine:3.19
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-    apk --no-cache -U add \
 		build-base \
 		git \
 		linux-headers \
@@ -24,6 +23,7 @@ RUN apk --no-cache -U upgrade && \
 # Setup Snare 
     git clone https://github.com/mushorg/snare /opt/snare && \
     cd /opt/snare/ && \
+    # git checkout 0919a80838eb0823a3b7029b0264628ee0a36211 && \
 	git checkout 08c69b7165354ea2040b6170c37d92ff3c304f96 && \
     cp /root/dist/requirements.txt . && \
     pip3 install --break-system-packages --no-cache-dir -r requirements.txt && \
@@ -31,6 +31,7 @@ RUN apk --no-cache -U upgrade && \
     cd / && \
     rm -rf /opt/snare && \
     mkdir -p /opt/snare/pages && \
+#    clone --target http://example.com && \
     mv /root/dist/pages/* /opt/snare/pages/ && \
 #
 # Setup configs, user, groups
@@ -51,4 +52,5 @@ RUN apk --no-cache -U upgrade && \
 # Start snare
 STOPSIGNAL SIGKILL
 USER snare:snare
+#CMD snare --tanner tanner --debug true --no-dorks true --auto-update false --host-ip 0.0.0.0 --port 80 --page-dir $(shuf -i 1-10 -n 1)
 CMD snare --tanner tanner --debug true --auto-update false --host-ip 0.0.0.0 --port 80 --page-dir $(shuf -i 1-10 -n 1)

docker/tanner/tanner/Dockerfile

@@ -4,8 +4,7 @@ FROM alpine:3.17
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-    apk --no-cache -U add \
 		build-base \
 		git \
 		libcap \
@@ -32,6 +31,7 @@ RUN apk --no-cache -U upgrade && \
 		python3-dev && \ 
 #
 # Setup Tanner
+#    git clone https://github.com/t3chn0m4g3/tanner /opt/tanner && \
 	git clone https://github.com/mushorg/tanner /opt/tanner && \
     cd /opt/tanner/ && \
     git checkout 245d628f4023e5462c7035e760a6b5eed0a33fbe && \
@@ -64,7 +64,7 @@ RUN apk --no-cache -U upgrade && \
             git \
             libcap \
             libffi-dev \
-            openssl-dev \
+#            libressl-dev \
             linux-headers \
             python3-dev && \
     rm -rf /root/* \

docker/tpotinit/Dockerfile

@@ -4,8 +4,7 @@ FROM alpine:edge
 COPY dist/ /opt/tpot/
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-    apk --no-cache -U add \
         aria2 \
         apache2-utils \
         bash \
@@ -19,6 +18,7 @@ RUN apk --no-cache -U upgrade && \
         grep \
         iproute2 \
         iptables \
+#        iptables-legacy \
         jq \
         logrotate \
         lsblk \

docker/wordpot/Dockerfile

@@ -1,11 +1,10 @@
-FROM alpine:3.20 AS builder
+FROM alpine:3.19
 #
 # Include dist
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN apk --no-cache -U upgrade && \
+RUN apk --no-cache -U add \
-	apk --no-cache -U add \
 		build-base \
 		git \
 		libcap \
@@ -19,32 +18,33 @@ RUN apk --no-cache -U upgrade && \
 		py3-werkzeug \
 		py3-yaml \
 		python3 \
-		python3-dev
+		python3-dev && \
 #	     
 # Install wordpot from GitHub and setup
-RUN mkdir -p /opt && \
+    mkdir -p /opt && \
     cd /opt/ && \
     git clone https://github.com/t3chn0m4g3/wordpot && \
     cd wordpot && \
-    git checkout b2701cb6c7057ed2843187c0c425bb8c13845719 && \
+    git checkout 8fedeb1b74e1d225da2a7273656bf0afa84a20aa && \
-    cp /root/dist/requirements.txt .
+    cp /root/dist/requirements.txt . && \
-WORKDIR /opt/wordpot
+    pip3 install --break-system-packages -r requirements.txt && \
-RUN pip3 install --no-cache-dir --break-system-packages pyinstaller
+    setcap cap_net_bind_service=+ep $(readlink -f $(type -P python3)) && \
-RUN	pip3 install --no-cache-dir --break-system-packages -r requirements.txt
-RUN pyinstaller wordpot.py \
-		--hidden-import hpfeeds \
-		--add-data "./wordpot/static:./wordpot/static" \
-		--add-data "./wordpot/templates:./wordpot/templates" \
-		--add-data "./wordpot/plugins:./wordpot/plugins" \
-		--add-data "./wordpot.conf:./"
-RUN ls -alR
 #
-FROM alpine:3.20
+# Setup user, groups and configs
-RUN apk --no-cache -U upgrade
+    addgroup -g 2000 wordpot && \
-COPY --from=builder /opt/wordpot/dist /opt/
+    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 wordpot && \
+    chown wordpot:wordpot -R /opt/wordpot && \
+#
+# Clean up
+    apk del --purge build-base \
+		git \
+		python3-dev && \
+    rm -rf /root/* \
+			/var/cache/apk/* \
+			/opt/wordpot/.git
 #
 # Start wordpot
 STOPSIGNAL SIGINT
-USER 2000:2000
+USER wordpot:wordpot
-WORKDIR /opt/wordpot/
+WORKDIR /opt/wordpot
-CMD ["./wordpot", "--host", "0.0.0.0", "--port", "80", "--title", "Wordpress"]
+CMD ["/usr/bin/python3","wordpot.py", "--host", "0.0.0.0", "--port", "80", "--title", "Wordpress"]