tweak deploy, add autoheal, start update Dockerfiles

- tweak deploy a little further
- start with rebuilding Dockerfiles
- rework healthcheck for adbhoney CPU issues
- bump adbhoney, ciscoasa, citrixhoneypot, conpot, cowriepot, ddospot to alpine 3.19
- fix conpot issue with py 3.11
- bump conpot to latest master
- bump cowrie to latest master
- add autoheal to tpotinit to restart unhealthy container (if healthcheck enabled)

docker/cowrie/Dockerfile

@@ -1,37 +1,37 @@
-FROM alpine:3.17
+FROM alpine:3.19
 #
 # Include dist
 COPY dist/ /root/dist/
 #
 # Get and install dependencies & packages
 RUN apk --no-cache -U add \
-             bash \
-             build-base \
-             git \
-             gmp-dev \
-             libcap \
-             libffi-dev \
-             mpc1-dev \
-             mpfr-dev \
-             openssl \
-             openssl-dev \
-	     py3-appdirs \
-	     py3-asn1-modules \
-	     py3-attrs \
-	     py3-bcrypt \
-	     py3-cryptography \
-	     py3-dateutil \
-	     py3-greenlet \
-	     py3-mysqlclient \
-	     py3-openssl \
-	     py3-packaging \
-	     py3-parsing \
-             py3-pip \
-	     py3-service_identity \
-	     py3-treq \
-	     py3-twisted \
-             python3 \
-             python3-dev && \
+			bash \
+			build-base \
+			git \
+			gmp-dev \
+			libcap \
+			libffi-dev \
+			mpc1-dev \
+			mpfr-dev \
+			openssl \
+			openssl-dev \
+			py3-appdirs \
+			py3-asn1-modules \
+			py3-attrs \
+			py3-bcrypt \
+			py3-cryptography \
+			py3-dateutil \
+			py3-greenlet \
+			py3-mysqlclient \
+			py3-openssl \
+			py3-packaging \
+			py3-parsing \
+			py3-pip \
+			py3-service_identity \
+			py3-treq \
+			py3-twisted \
+			python3 \
+			python3-dev && \
 #
 # Setup user
     addgroup -g 2000 cowrie && \
@@ -40,20 +40,20 @@ RUN apk --no-cache -U add \
 # Install cowrie
     mkdir -p /home/cowrie && \
     cd /home/cowrie && \
-    git clone --depth=1 https://github.com/cowrie/cowrie -b v2.5.0 && \
-    #git clone --depth=1 https://github.com/cowrie/cowrie && \
+    # git clone --depth=1 https://github.com/cowrie/cowrie -b v2.5.0 && \
+    git clone --depth=1 https://github.com/cowrie/cowrie && \
     cd cowrie && \
-    #git checkout 8b1e1cf4db0d3b0e70b470cf40385bbbd3ed1733 && \
+    git checkout 3394082040c02d91e79efa2c640ad68da9fe2231 && \
     mkdir -p log && \
     cp /root/dist/requirements.txt . && \
-    pip3 install --upgrade pip && \
-    pip3 install -r requirements.txt && \
+    pip3 install --break-system-packages --upgrade pip && \
+    pip3 install --break-system-packages -r requirements.txt && \
 #
 # Setup configs
-    export PYTHON_DIR=$(python3 --version | tr '[A-Z]' '[a-z]' | tr -d ' ' | cut -d '.' -f 1,2 ) && \
-    setcap cap_net_bind_service=+ep /usr/bin/$PYTHON_DIR && \
+    #export PYTHON_DIR=$(python3 --version | tr '[A-Z]' '[a-z]' | tr -d ' ' | cut -d '.' -f 1,2 ) && \
+    setcap cap_net_bind_service=+ep $(readlink -f $(type -P python3)) && \
     cp /root/dist/cowrie.cfg /home/cowrie/cowrie/cowrie.cfg && \
-    chown cowrie:cowrie -R /home/cowrie/* /usr/lib/$PYTHON_DIR/site-packages/twisted/plugins && \
+    chown cowrie:cowrie -R /home/cowrie/* /usr/lib/$(readlink -f $(type -P python3) | cut -f4 -d"/")/site-packages/twisted/plugins && \
 #
 # Start Cowrie once to prevent dropin.cache errors upon container start caused by read-only filesystem
     su - cowrie -c "export PYTHONPATH=/home/cowrie/cowrie:/home/cowrie/cowrie/src && \

docker/cowrie/docker-compose.yml

@@ -23,7 +23,7 @@ services:
     image: "dtagdevsec/cowrie:alpha"
     read_only: true
     volumes:
-     - /data/cowrie/downloads:/home/cowrie/cowrie/dl
-     - /data/cowrie/keys:/home/cowrie/cowrie/etc
-     - /data/cowrie/log:/home/cowrie/cowrie/log
-     - /data/cowrie/log/tty:/home/cowrie/cowrie/log/tty
+     - $HOME/tpotce/data/cowrie/downloads:/home/cowrie/cowrie/dl
+     - $HOME/tpotce/data/cowrie/keys:/home/cowrie/cowrie/etc
+     - $HOME/tpotce/data/cowrie/log:/home/cowrie/cowrie/log
+     - $HOME/tpotce/data/cowrie/log/tty:/home/cowrie/cowrie/log/tty