From fc1484624d451b958a950b09dd1612f547ce7628 Mon Sep 17 00:00:00 2001 From: Kraemii Date: Tue, 19 Aug 2025 12:25:08 +0200 Subject: [PATCH 1/3] remove pip upgrade and add adduser --- .docker/prod.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile index 7fab52cc..4aa2a531 100644 --- a/.docker/prod.Dockerfile +++ b/.docker/prod.Dockerfile @@ -19,8 +19,7 @@ RUN apt-get update && \ apt-get remove --purge --auto-remove -y && \ rm -rf /var/lib/apt/lists/* -RUN python3 -m pip install --upgrade --break-system-packages pip && \ - python3 -m pip install --break-system-packages poetry +RUN python3 -m pip install --break-system-packages poetry RUN rm -rf dist && poetry build -f wheel @@ -45,6 +44,7 @@ RUN apt-get update && \ python3 \ python3-pip \ tini \ + adduser \ python3-dev && \ apt-get remove --purge --auto-remove -y && \ rm -rf /var/lib/apt/lists/* From 8e687ad711d3d5bc4852f7c6d76a64568e7e724f Mon Sep 17 00:00:00 2001 From: Kraemii Date: Tue, 19 Aug 2025 12:42:32 +0200 Subject: [PATCH 2/3] remove mkdir /run/sshd --- smoketest/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/smoketest/Dockerfile b/smoketest/Dockerfile index 3f6fbbf7..54139fd9 100644 --- a/smoketest/Dockerfile +++ b/smoketest/Dockerfile @@ -17,8 +17,8 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge python3 \ python3-pip \ openssh-server &&\ - apt-get remove --purge --auto-remove -y &&\ - rm -rf /var/lib/apt/lists/* + apt-get remove --purge --auto-remove -y &&\ + rm -rf /var/lib/apt/lists/* COPY --chmod=7777 . /usr/local/src/ospd-openvas COPY smoketest/redis.conf /etc/redis/redis.conf RUN rm -rf /var/lib/openvas/plugins/* @@ -60,8 +60,8 @@ RUN cp -r /usr/local/src/ospd-openvas/smoketest/data/plugins/* /var/lib/openvas/ RUN rm -rf /usr/local/src/ospd-openvas RUN apt-get remove --purge --auto-remove -y python3-pip RUN chown -R gvm:redis /var/lib/openvas/plugins/ -RUN mkdir /run/sshd # make gvm capable of running sshd +RUN chown -R gvm:redis /run/sshd RUN chown -R gvm:redis /etc/ssh RUN echo 'gvm:test' | chpasswd RUN sed -i 's/#PidFile/Pidfile/' /etc/ssh/sshd_config From 77166366df144c693273b967ec68e5d4e93b7892 Mon Sep 17 00:00:00 2001 From: Kraemii Date: Thu, 21 Aug 2025 10:59:41 +0200 Subject: [PATCH 3/3] Fix smoketest --- smoketest/usecases/notus/server.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/smoketest/usecases/notus/server.go b/smoketest/usecases/notus/server.go index ff160713..bf908552 100644 --- a/smoketest/usecases/notus/server.go +++ b/smoketest/usecases/notus/server.go @@ -110,7 +110,9 @@ func NewServer(address string) (*Server, error) { if err != nil { return nil, err } - cfg := mqtt.Configuration{} + cfg := mqtt.Configuration{ + KeepAlive: 5, + } client, err := mqtt.New(conn, cfg) if err != nil { return nil, err