Skip to content
Merged

Fix CI #1054

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .docker/prod.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
WORKDIR /usr/local/src
RUN make build-cmds

FROM debian:stable-slim as builder

Check warning on line 8 in .docker/prod.Dockerfile

View workflow job for this annotation

GitHub Actions / Build and Push to Greenbone Registry / build-amd64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 8 in .docker/prod.Dockerfile

View workflow job for this annotation

GitHub Actions / Production Images

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

COPY . /source

Expand All @@ -19,16 +19,15 @@
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

FROM registry.community.greenbone.net/community/openvas-scanner:${VERSION}

ENV PYTHONDONTWRITEBYTECODE 1

Check warning on line 28 in .docker/prod.Dockerfile

View workflow job for this annotation

GitHub Actions / Build and Push to Greenbone Registry / build-amd64

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 28 in .docker/prod.Dockerfile

View workflow job for this annotation

GitHub Actions / Production Images

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
ENV PYTHONUNBUFFERED 1

Check warning on line 29 in .docker/prod.Dockerfile

View workflow job for this annotation

GitHub Actions / Build and Push to Greenbone Registry / build-amd64

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 29 in .docker/prod.Dockerfile

View workflow job for this annotation

GitHub Actions / Production Images

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
ENV PIP_NO_CACHE_DIR off

Check warning on line 30 in .docker/prod.Dockerfile

View workflow job for this annotation

GitHub Actions / Build and Push to Greenbone Registry / build-amd64

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 30 in .docker/prod.Dockerfile

View workflow job for this annotation

GitHub Actions / Production Images

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

COPY --from=tools /usr/local/src/bin/ospd-scans /usr/local/bin/
COPY ./config/ospd-openvas.conf /etc/gvm/ospd-openvas.conf
Expand All @@ -45,6 +44,7 @@
python3 \
python3-pip \
tini \
adduser \
python3-dev && \
apt-get remove --purge --auto-remove -y && \
rm -rf /var/lib/apt/lists/*
Expand Down
6 changes: 3 additions & 3 deletions smoketest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion smoketest/usecases/notus/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading