revert honeytrap to ubuntu 22.04

Merge branch 'master' of https://github.com/telekom-security/tpotce
update beelzebub (time, dest_port)
2025-12-27 00:32:43 +00:00 · 2025-01-10 19:58:17 +01:00 · 2025-01-09 19:42:04 +01:00 · 2025-01-09 19:41:45 +01:00 · 2025-01-09 11:49:08 +01:00 · 2025-01-08 15:27:02 -07:00
5 changed files with 6 additions and 6 deletions
--- a/docker/beelzebub/Dockerfile
+++ b/docker/beelzebub/Dockerfile
@ -12,7 +12,7 @@ WORKDIR /root
 # Build beelzebub
 RUN git clone https://github.com/t3chn0m4g3/beelzebub && \
    cd beelzebub && \
-    git checkout 17a0854b8d9d1e41cf5435b5dc85354bbfb9093c
+    git checkout 0b9aba53ec1671f669d22782758142a1d411b858
 WORKDIR /root/beelzebub
 RUN go mod download
 RUN go build -o main .
--- a/docker/beelzebub/docker-compose.yml
+++ b/docker/beelzebub/docker-compose.yml
@ -22,7 +22,7 @@ services:
      LLM_MODEL: "ollama"
      LLM_HOST: "http://ollama.local:11434/api/chat"
      OLLAMA_MODEL: "openchat"
-    image: "dtagdevsec/beelzebub:24.04"
+    image: "ghcr.io/telekom-security/beelzebub:24.04.1"
    read_only: true
    volumes:
     - $HOME/tpotce/data/beelzebub/key:/opt/beelzebub/configurations/key
--- a/docker/honeytrap/Dockerfile
+++ b/docker/honeytrap/Dockerfile
@ -1,4 +1,4 @@
-FROM ubuntu:24.10
+FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND noninteractive
 #
 # Include dist
@ -28,7 +28,7 @@ RUN apt-get update && \
 # Install honeytrap from source
    git clone https://github.com/t3chn0m4g3/honeytrap /root/honeytrap && \
    cd /root/honeytrap/ && \
-    git checkout 9b63a5452ed3d5004ca714a7965218c25226a504 && \
+#    git checkout 9aa4f734f2ea2f0da790b02d79afe18204a23982 && \
    autoreconf -vfi && \
    ./configure \
      --with-stream-mon=nfq \
--- a/docker/honeytrap/docker-compose.yml
+++ b/docker/honeytrap/docker-compose.yml
@ -12,7 +12,7 @@ services:
    network_mode: "host"
    cap_add:
     - NET_ADMIN
-    image: "dtagdevsec/honeytrap:24.04"
+    image: "ghcr.io/telekom-security/honeytrap:24.04.1"
    read_only: true
    volumes:
     - $HOME/tpotce/data/honeytrap/attacks:/opt/honeytrap/var/attacks
--- a/installer/install/tpot.yml
+++ b/installer/install/tpot.yml
@ -356,7 +356,7 @@
      shell: |
        if [ "$(dnf repolist docker-ce-stable)" == "" ];
          then
-            dnf -y config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
+            dnf -y config-manager addrepo --from-repofile=https://download.docker.com/linux/fedora/docker-ce.repo
        fi
      when: ansible_distribution in ["Fedora"]
      tags:
Author	SHA1	Message	Date
t3chn0m4g3	896d719cfb	revert honeytrap to ubuntu 22.04	2025-01-10 19:58:17 +01:00
t3chn0m4g3	919031bd2a	Merge branch 'master' of https://github.com/telekom-security/tpotce	2025-01-09 19:42:04 +01:00
t3chn0m4g3	67d115fc21	update beelzebub (time, dest_port)	2025-01-09 19:41:45 +01:00
Marco Ochse	11328412ab	Merge pull request #1731 from dotdlew/patch-1 Update tpot.yml	2025-01-09 11:49:08 +01:00
Daniel H. Lewis	3334c5d0c7	Update tpot.yml the original dnf config-manager command for fedora is incorrect and results in a syntax error. updated to working syntax	2025-01-08 15:27:02 -07:00