From 5f0c337f09da583b0abadee058fdd66d2efc60f1 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Tue, 14 Jun 2022 10:47:11 +0000
Subject: [PATCH] bump elk, log4pot, honeytrap, dionaea to ubuntu 22.04

---
 docker/dionaea/Dockerfile           | 6 +++---
 docker/elk/elasticsearch/Dockerfile | 2 +-
 docker/elk/kibana/Dockerfile        | 2 +-
 docker/elk/logstash/Dockerfile      | 2 +-
 docker/honeytrap/Dockerfile         | 2 +-
 docker/log4pot/Dockerfile           | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker/dionaea/Dockerfile b/docker/dionaea/Dockerfile
index 8bc5b0df..074a2008 100644
--- a/docker/dionaea/Dockerfile
+++ b/docker/dionaea/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND noninteractive
 #
 # Include dist
@@ -88,7 +88,7 @@ RUN ARCH=$(arch) && \
       python3-bson \
       python3-yaml \ 
       wget && \ 
-#
+
     apt-get install -y \
       ca-certificates \
       python3 \
@@ -102,7 +102,7 @@ RUN ARCH=$(arch) && \
       libnetfilter-queue1 \
       libnl-3-200 \
       libpcap0.8 \
-      libpython3.8 \
+      libpython3.10 \
       libudns0 && \
 #
     apt-get autoremove --purge -y && \
diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile
index 29567fca..ade21a89 100644
--- a/docker/elk/elasticsearch/Dockerfile
+++ b/docker/elk/elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 #
 # VARS
 ENV ES_VER=8.2.2
diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile
index d698770e..a4d627ff 100644
--- a/docker/elk/kibana/Dockerfile
+++ b/docker/elk/kibana/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 #
 # VARS
 ENV KB_VER=8.2.2
diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile
index 76acf567..81296a96 100644
--- a/docker/elk/logstash/Dockerfile
+++ b/docker/elk/logstash/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 #
 # VARS
 ENV LS_VER=8.2.2
diff --git a/docker/honeytrap/Dockerfile b/docker/honeytrap/Dockerfile
index 5af73372..05f96218 100644
--- a/docker/honeytrap/Dockerfile
+++ b/docker/honeytrap/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND noninteractive
 #
 # Include dist
diff --git a/docker/log4pot/Dockerfile b/docker/log4pot/Dockerfile
index 6dde6ab3..9bda496d 100644
--- a/docker/log4pot/Dockerfile
+++ b/docker/log4pot/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND noninteractive
 #
 # Install packages
@@ -31,7 +31,7 @@ RUN apt-get update -y && \
     git checkout fac539f470217347e51127c635f16749a887c0ac && \
     sed -i 's#"type": logtype,#"reason": logtype,#g' log4pot-server.py && \
     poetry install && \
-    setcap cap_net_bind_service=+ep /usr/bin/python3.8 && \
+    setcap cap_net_bind_service=+ep /usr/bin/python3.10 && \
 #
 # Setup user, groups and configs
     addgroup --gid 2000 log4pot && \