From 22acb6fa84781d088258a44bc355a0421df3c736 Mon Sep 17 00:00:00 2001 From: t3chn0m4g3 Date: Wed, 19 Jan 2022 00:46:04 +0000 Subject: [PATCH] bump to Alpine 3.15 --- docker/cowrie/Dockerfile | 1 - docker/cyberchef/Dockerfile | 2 +- docker/ddospot/Dockerfile | 2 +- docker/dicompot/Dockerfile | 2 +- docker/elasticpot/Dockerfile | 2 +- docker/endlessh/Dockerfile | 2 +- docker/ews/Dockerfile | 2 +- docker/fatt/Dockerfile | 2 +- docker/glutton/Dockerfile | 2 +- docker/heimdall/Dockerfile | 2 +- docker/hellpot/Dockerfile | 7 ++++--- docker/heralding/Dockerfile | 2 +- docker/honeypots/Dockerfile | 3 +-- docker/ipphoney/Dockerfile | 4 ++-- docker/medpot/Dockerfile | 2 +- docker/p0f/Dockerfile | 2 +- docker/redishoneypot/Dockerfile | 2 +- docker/spiderfoot/Dockerfile | 6 +++--- docker/spiderfoot/docker-compose.yml | 2 +- docker/suricata/Dockerfile | 2 +- 20 files changed, 25 insertions(+), 26 deletions(-) diff --git a/docker/cowrie/Dockerfile b/docker/cowrie/Dockerfile index 4d536348..8a76363e 100644 --- a/docker/cowrie/Dockerfile +++ b/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 && \ diff --git a/docker/cyberchef/Dockerfile b/docker/cyberchef/Dockerfile index 8b994ada..20d9038d 100644 --- a/docker/cyberchef/Dockerfile +++ b/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 \ diff --git a/docker/ddospot/Dockerfile b/docker/ddospot/Dockerfile index f9437697..cbe8cb6d 100644 --- a/docker/ddospot/Dockerfile +++ b/docker/ddospot/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 # # Install packages RUN apk -U add \ diff --git a/docker/dicompot/Dockerfile b/docker/dicompot/Dockerfile index 68c56a88..aaebf37a 100644 --- a/docker/dicompot/Dockerfile +++ b/docker/dicompot/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 # # Setup apk RUN apk -U add --no-cache \ diff --git a/docker/elasticpot/Dockerfile b/docker/elasticpot/Dockerfile index eae51dc9..d5c50995 100644 --- a/docker/elasticpot/Dockerfile +++ b/docker/elasticpot/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 # # Include dist ADD dist/ /root/dist/ diff --git a/docker/endlessh/Dockerfile b/docker/endlessh/Dockerfile index b1ef42f8..72e13475 100644 --- a/docker/endlessh/Dockerfile +++ b/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/ # diff --git a/docker/ews/Dockerfile b/docker/ews/Dockerfile index a58be85f..3786d052 100644 --- a/docker/ews/Dockerfile +++ b/docker/ews/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 # # Include dist ADD dist/ /root/dist/ diff --git a/docker/fatt/Dockerfile b/docker/fatt/Dockerfile index 9dec2ae4..be7b6681 100644 --- a/docker/fatt/Dockerfile +++ b/docker/fatt/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 # # Get and install dependencies & packages RUN apk -U add \ diff --git a/docker/glutton/Dockerfile b/docker/glutton/Dockerfile index 71689fc2..fefbabdd 100644 --- a/docker/glutton/Dockerfile +++ b/docker/glutton/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.13 +FROM alpine:3.15 # # Include dist ADD dist/ /root/dist/ diff --git a/docker/heimdall/Dockerfile b/docker/heimdall/Dockerfile index 06758b85..05ffc378 100644 --- a/docker/heimdall/Dockerfile +++ b/docker/heimdall/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 # # Include dist ADD dist/ /root/dist/ diff --git a/docker/hellpot/Dockerfile b/docker/hellpot/Dockerfile index a9975bd8..c71620ea 100644 --- a/docker/hellpot/Dockerfile +++ b/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 && \ - # Hellpot ignores setting the logpath, need to this hardcoded :( + git checkout 1312f20e719223099af8aad80f316420ee3dfcb1 && \ + # 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/ && \ # diff --git a/docker/heralding/Dockerfile b/docker/heralding/Dockerfile index 90438a02..e0a5126c 100644 --- a/docker/heralding/Dockerfile +++ b/docker/heralding/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 # # Include dist ADD dist/ /root/dist/ diff --git a/docker/honeypots/Dockerfile b/docker/honeypots/Dockerfile index b07ac6e3..96c881b3 100644 --- a/docker/honeypots/Dockerfile +++ b/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 diff --git a/docker/ipphoney/Dockerfile b/docker/ipphoney/Dockerfile index 36b93db5..42454f56 100644 --- a/docker/ipphoney/Dockerfile +++ b/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 && \ diff --git a/docker/medpot/Dockerfile b/docker/medpot/Dockerfile index c5ea415b..6cf8527c 100644 --- a/docker/medpot/Dockerfile +++ b/docker/medpot/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 # # Setup apk RUN apk -U --no-cache add \ diff --git a/docker/p0f/Dockerfile b/docker/p0f/Dockerfile index 5fcc89cd..3dc1da4e 100644 --- a/docker/p0f/Dockerfile +++ b/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 diff --git a/docker/redishoneypot/Dockerfile b/docker/redishoneypot/Dockerfile index bdce15e9..6695789e 100644 --- a/docker/redishoneypot/Dockerfile +++ b/docker/redishoneypot/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 # # Include dist ADD dist/ /root/dist/ diff --git a/docker/spiderfoot/Dockerfile b/docker/spiderfoot/Dockerfile index ae058415..e32df0f3 100644 --- a/docker/spiderfoot/Dockerfile +++ b/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 diff --git a/docker/spiderfoot/docker-compose.yml b/docker/spiderfoot/docker-compose.yml index 8ef7a998..c2487a02 100644 --- a/docker/spiderfoot/docker-compose.yml +++ b/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 diff --git a/docker/suricata/Dockerfile b/docker/suricata/Dockerfile index 1e9f5171..007e9d65 100644 --- a/docker/suricata/Dockerfile +++ b/docker/suricata/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 # # Include dist ADD dist/ /root/dist/