bump to Alpine 3.15

docker/cowrie/Dockerfile

@@ -29,7 +29,6 @@ RUN apk -U add \
     git clone --depth=1 https://github.com/micheloosterhof/cowrie -b v2.3.0 && \
     cd cowrie && \
 #    git checkout 6b1e82915478292f1e77ed776866771772b48f2e && \
-#    sed -i s/logfile.DailyLogFile/logfile.LogFile/g src/cowrie/python/logfile.py && \
     mkdir -p log && \
     sed -i '/packaging.*/d' requirements.txt && \
     pip3 install --upgrade pip && \

docker/cyberchef/Dockerfile

@@ -12,7 +12,7 @@ RUN npm install
 RUN grunt prod
 #
 # Move from builder
-FROM alpine:3.14
+FROM alpine:3.15
 #
 RUN apk -U --no-cache add \
       curl \

docker/ddospot/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Install packages
 RUN apk -U add \

docker/dicompot/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Setup apk
 RUN apk -U add --no-cache \

docker/elasticpot/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Include dist
 ADD dist/ /root/dist/

docker/endlessh/Dockerfile

@@ -16,7 +16,7 @@ RUN apk -U add --no-cache \
     make && \
     mv /opt/endlessh/endlessh /root/dist
 #
-FROM alpine:3.14
+FROM alpine:3.15
 #
 COPY --from=builder /root/dist/* /opt/endlessh/
 #

docker/ews/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Include dist
 ADD dist/ /root/dist/

docker/fatt/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Get and install dependencies & packages
 RUN apk -U add \

docker/glutton/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.15
 #
 # Include dist
 ADD dist/ /root/dist/

docker/heimdall/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Include dist
 ADD dist/ /root/dist/

docker/hellpot/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Include dist
 ADD dist/ /root/dist/
@@ -17,10 +17,11 @@ RUN apk -U --no-cache add \
     mkdir -p /opt/go && \ 
     git clone https://github.com/yunginnanet/HellPot && \
     cd HellPot && \
-    git checkout f87b1f17e21b36edae41b7f49d4a54ae420a9bf8 && \
+    git checkout 1312f20e719223099af8aad80f316420ee3dfcb1 && \
-  # Hellpot ignores setting the logpath, need to this hardcoded :(
+  # Hellpot ignores setting the logpath, need to do this hardcoded ...
     sed -i 's#logDir = snek.GetString("logger.directory")#logDir = "/var/log/hellpot/"#g' config/logger.go && \
     sed -i 's#tnow := "HellPot"#tnow := "hellpot"#g' config/logger.go && \
+    sed -i 's#logFileName := "HellPot"#logFileName := "hellpot"#g' config/logger.go && \
     go build cmd/HellPot/HellPot.go && \
     mv /root/HellPot/HellPot /opt/hellpot/ && \
 #

docker/heralding/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #  
 # Include dist
 ADD dist/ /root/dist/

docker/honeypots/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Include dist
 ADD dist/ /root/dist/
@@ -62,4 +62,3 @@ STOPSIGNAL SIGINT
 USER honeypots:honeypots
 WORKDIR /opt/honeypots/
 CMD python3 -m honeypots --setup all --config config.json
-#CMD python3 -m honeypots --setup telnet --config config.json

docker/ipphoney/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.15
 #
 # Include dist
 ADD dist/ /root/dist/
@@ -26,7 +26,7 @@ RUN apk -U add \
     git checkout 7ab1cac437baba17cb2cd25d5bb1400327e1bb79 && \
     pip3 install --ignore-installed packaging && \
     pip3 install -r requirements.txt && \
-    setcap cap_net_bind_service=+ep /usr/bin/python3.8 && \
+    setcap cap_net_bind_service=+ep /usr/bin/python3.9 && \
 #
 # Setup user, groups and configs
     addgroup -g 2000 ipphoney && \

docker/medpot/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Setup apk
 RUN apk -U --no-cache add \

docker/p0f/Dockerfile

@@ -1,6 +1,6 @@
 # In case of problems Alpine 3.13 needs to be used:
 # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Add source
 ADD . /opt/p0f

docker/redishoneypot/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Include dist
 ADD dist/ /root/dist/

docker/spiderfoot/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Get and install dependencies & packages
 RUN apk -U --no-cache add \
@@ -29,11 +29,12 @@ RUN apk -U --no-cache add \
     adduser -S -s /bin/ash -u 2000 -D -g 2000 spiderfoot && \
 #
 # Install spiderfoot 
-    git clone --depth=1 -b v3.4 https://github.com/smicallef/spiderfoot /home/spiderfoot && \
+    git clone --depth=1 -b v3.5 https://github.com/smicallef/spiderfoot /home/spiderfoot && \
     cd /home/spiderfoot && \
     pip3 install --upgrade pip && \
     pip3 install --no-cache-dir wheel && \ 
     pip3 install --no-cache-dir -r requirements.txt && \ 
+    mkdir -p /home/spiderfoot/.spiderfoot/logs && \
     chown -R spiderfoot:spiderfoot /home/spiderfoot && \
     sed -i "s#'root': '\/'#'root': '\/spiderfoot'#" /home/spiderfoot/sf.py && \
     sed -i "s#'root', '\/'#'root', '\/spiderfoot'#" /home/spiderfoot/sf.py && \
@@ -53,7 +54,6 @@ RUN apk -U --no-cache add \
     rm -rf /var/cache/apk/*
 #
 # Healthcheck
-#HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:8080'
 HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:8080/spiderfoot/'
 #
 # Set user, workdir and start spiderfoot

docker/spiderfoot/docker-compose.yml

@@ -16,4 +16,4 @@ services:
      - "127.0.0.1:64303:8080"
     image: "dtagdevsec/spiderfoot:2203"
     volumes:
-     - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db
+     - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/.spiderfoot/spiderfoot.db

docker/suricata/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 #
 # Include dist
 ADD dist/ /root/dist/