From 390390fd43034d7df3a89182f6f18162de9d019d Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Mon, 23 Jan 2023 15:42:59 +0000
Subject: [PATCH] bump to alpine 3.17, tweaking, fixes for py 3.10

---
 docker/p0f/Dockerfile                     | 2 +-
 docker/redishoneypot/Dockerfile           | 2 +-
 docker/spiderfoot/Dockerfile              | 4 ++--
 docker/tanner/redis/Dockerfile            | 2 +-
 docker/tanner/snare/Dockerfile            | 2 +-
 docker/tanner/snare/dist/requirements.txt | 2 +-
 docker/tanner/tanner/Dockerfile           | 9 +++++----
 docker/wordpot/Dockerfile                 | 2 +-
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/docker/p0f/Dockerfile b/docker/p0f/Dockerfile
index 563ade72..d64163ff 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.16
+FROM alpine:3.17
 #
 # Add source
 COPY . /opt/p0f
diff --git a/docker/redishoneypot/Dockerfile b/docker/redishoneypot/Dockerfile
index 13f846bb..2227e2f1 100644
--- a/docker/redishoneypot/Dockerfile
+++ b/docker/redishoneypot/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.17
 #
 # Include dist
 COPY dist/ /root/dist/
diff --git a/docker/spiderfoot/Dockerfile b/docker/spiderfoot/Dockerfile
index 0a6376b1..516b6b13 100644
--- a/docker/spiderfoot/Dockerfile
+++ b/docker/spiderfoot/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.17
 #
 # Include dist
 COPY dist/ /root/dist/
@@ -70,7 +70,7 @@ RUN apk -U --no-cache add \
 # Clean up
     apk del --purge build-base \
                     gcc \
-                    git \
+                   git \
 		    libffi-dev \
                     libxml2-dev \
                     libxslt-dev \
diff --git a/docker/tanner/redis/Dockerfile b/docker/tanner/redis/Dockerfile
index 3ac962b0..c69949bd 100644
--- a/docker/tanner/redis/Dockerfile
+++ b/docker/tanner/redis/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.15
+FROM alpine:3.17
 #
 # Include dist
 COPY dist/ /root/dist/
diff --git a/docker/tanner/snare/Dockerfile b/docker/tanner/snare/Dockerfile
index 1f8db9a4..801272d8 100644
--- a/docker/tanner/snare/Dockerfile
+++ b/docker/tanner/snare/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.15
+FROM alpine:3.17
 #
 # Include dist
 COPY dist/ /root/dist/
diff --git a/docker/tanner/snare/dist/requirements.txt b/docker/tanner/snare/dist/requirements.txt
index 42765b8e..1a155aaa 100644
--- a/docker/tanner/snare/dist/requirements.txt
+++ b/docker/tanner/snare/dist/requirements.txt
@@ -1,2 +1,2 @@
-aiohttp_jinja2==1.1.0
+aiohttp_jinja2==1.5.0
 cssutils==1.0.2
diff --git a/docker/tanner/tanner/Dockerfile b/docker/tanner/tanner/Dockerfile
index 76e6d042..4193b000 100644
--- a/docker/tanner/tanner/Dockerfile
+++ b/docker/tanner/tanner/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.15
+FROM alpine:3.17
 #
 # Include dist
 COPY dist/ /root/dist/
@@ -31,12 +31,13 @@ RUN apk -U --no-cache add \
                python3-dev && \ 
 #
 # Setup Tanner
-    git clone https://github.com/mushorg/tanner /opt/tanner && \
+#    git clone https://github.com/mushorg/tanner /opt/tanner && \
+    git clone https://github.com/t3chn0m4g3/tanner /opt/tanner && \
     cd /opt/tanner/ && \
 #    git fetch origin pull/364/head:test && \	
 #    git checkout test && \
 #    git checkout 20dabcbccc50f8878525677b925a4c9abcaf9f54 && \
-    git checkout 2fdce2e2ad7e125012c7e6dcbfa02b50f73c128e && \
+#    git checkout 2fdce2e2ad7e125012c7e6dcbfa02b50f73c128e && \
 #    sed -i 's/aioredis/aioredis==1.3.1/g' requirements.txt && \
 #    sed -i 's/^aiohttp$/aiohttp==3.7.4/g' requirements.txt && \
     cp /root/dist/config.yaml /opt/tanner/tanner/data && \
@@ -68,7 +69,7 @@ RUN apk -U --no-cache add \
             git \
             libcap \
             libffi-dev \
-            libressl-dev \
+#            libressl-dev \
             linux-headers \
             python3-dev && \
     rm -rf /root/* && \
diff --git a/docker/wordpot/Dockerfile b/docker/wordpot/Dockerfile
index 6000dba0..e31b4668 100644
--- a/docker/wordpot/Dockerfile
+++ b/docker/wordpot/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.17
 #
 # Include dist
 COPY dist/ /root/dist/