tweaking

healthcheck, watch pid not cpu
cleanup dockerfiles
bump dicompot, heralding, elasticpot, endlessh to alpine 3.19
bump dionaea, heralding to latest master

docker/elasticpot/Dockerfile

@@ -1,40 +1,40 @@
-FROM alpine:3.17
+FROM alpine:3.19
 #
 # Include dist
 COPY dist/ /root/dist/
 #
 # Install packages
 RUN apk -U --no-cache add \
-             build-base \
-	     ca-certificates \
-             git \
-             libffi-dev \
-	     openssl \
-             openssl-dev \
-	     postgresql-dev \
-             py3-cryptography \
-	     py3-elasticsearch \
-	     py3-geoip2 \
-	     py3-maxminddb \
-             py3-mysqlclient \
-	     py3-packaging \
-	     py3-psycopg2 \
-	     py3-redis \
-             py3-requests \
-	     py3-service_identity \
-	     py3-setuptools \
-	     py3-pip \
-	     py3-twisted \
-	     py3-wheel \
-             python3 \
-             python3-dev && \
+		build-base \
+		ca-certificates \
+		git \
+		libffi-dev \
+		openssl \
+		openssl-dev \
+		postgresql-dev \
+		py3-cryptography \
+		py3-elasticsearch \
+		py3-geoip2 \
+		py3-maxminddb \
+		py3-mysqlclient \
+		py3-packaging \
+		py3-psycopg2 \
+		py3-redis \
+		py3-requests \
+		py3-service_identity \
+		py3-setuptools \
+		py3-pip \
+		py3-twisted \
+		py3-wheel \
+		python3 \
+		python3-dev && \
     mkdir -p /opt && \
     cd /opt/ && \
     git clone https://gitlab.com/bontchev/elasticpot.git/ && \
     cd elasticpot && \
     git checkout d12649730d819bd78ea622361b6c65120173ad45 && \
     cp /root/dist/requirements.txt . && \
-    pip3 install -r requirements.txt && \
+    pip3 install --break-system-packages -r requirements.txt && \
 #
 # Setup user, groups and configs
     addgroup -g 2000 elasticpot && \
@@ -43,11 +43,11 @@ RUN apk -U --no-cache add \
 #
 # Clean up
     apk del --purge build-base \
-                    git \
-                    libffi-dev \
-		    openssl-dev \
-		    postgresql-dev \
-		    python3-dev && \
+		git \
+		libffi-dev \
+		openssl-dev \
+		postgresql-dev \
+		python3-dev && \
     rm -rf /root/* && \
     rm -rf /var/cache/apk/* /opt/elasticpot/.git
 #

docker/elasticpot/docker-compose.yml

@@ -19,4 +19,4 @@ services:
     image: "dtagdevsec/elasticpot:alpha"
     read_only: true
     volumes:
-     - /data/elasticpot/log:/opt/elasticpot/log
+     - $HOME/tpotce/data/elasticpot/log:/opt/elasticpot/log