Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #868

Merged
merged 4 commits into from
Jan 16, 2025
Merged

Update dependencies #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc9ac0f
Sort to be installed dependencies
bjoernricks Jan 15, 2025
5205ce9
Remove libjson-glib from oldstable and stable Dockerfiles
bjoernricks Jan 15, 2025
b4197e6
Install libcurl in GnuTLS flavor for testing and stable Dockerfiles
bjoernricks Jan 15, 2025
65b34b4
Fix: Use same libcurl variant as OpenVAS Scanner
bjoernricks Jan 15, 2025
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
37 changes: 18 additions & 19 deletions .docker/prod-oldstable.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ COPY . /source
RUN apt-get update && \
apt-get install -y --no-install-recommends \
build-essential \
curl \
cmake \
pkg-config \
curl \
gnupg \
lcov \
libcgreen1-dev \
libcjson-dev \
libglib2.0-dev \
libgpgme-dev \
libgnutls28-dev \
uuid-dev \
libssh-gcrypt-dev \
libgpgme-dev \
libhiredis-dev \
libxml2-dev \
libpcap-dev \
libnet1-dev \
libldap2-dev \
libradcli-dev \
libnet1-dev \
libpaho-mqtt-dev \
libcgreen1-dev \
lcov \
libpcap-dev \
libradcli-dev \
libssh-gcrypt-dev \
libxml2-dev \
pkg-config \
uuid-dev \
&& rm -rf /var/lib/apt/lists/*
RUN cmake -DCMAKE_BUILD_TYPE=Release -DOPENVASD=0 -B/build /source
RUN DESTDIR=/install cmake --build /build -- install
Expand All @@ -40,18 +40,17 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends \
libcjson1 \
libglib2.0-0 \
libgpgme11 \
libgnutls30 \
libuuid1 \
libjson-glib-1.0-0 \
libssh-gcrypt-4 \
libgpgme11 \
libhiredis0.14 \
libxml2 \
libpcap0.8 \
libnet1 \
libldap-common \
libradcli4 \
libnet1 \
libpaho-mqtt1.3 \
libpcap0.8 \
libradcli4 \
libssh-gcrypt-4 \
libuuid1 \
libxml2 \
&& rm -rf /var/lib/apt/lists/*

COPY --from=build /install/ /
Expand Down
17 changes: 9 additions & 8 deletions .docker/prod-testing.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@ ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y --no-install-recommends \
libcjson1 \
libcurl3t64-gnutls \
libglib2.0-0 \
libgpgme11 \
libgnutls30 \
libuuid1 \
libssh-dev \
libhiredis1.1.0 \
libgpgme11 \
libhiredis-dev \
libxml2 \
libpcap0.8 \
libnet1 \
libhiredis1.1.0 \
libldap-common \
libradcli4 \
libnet1 \
libpaho-mqtt1.3 \
libpcap0.8 \
libradcli4 \
libssh-dev \
libuuid1 \
libxml2 \
&& rm -rf /var/lib/apt/lists/*

COPY --from=build /install/ /
Expand Down
16 changes: 8 additions & 8 deletions .docker/prod.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y --no-install-recommends \
libcjson1 \
libcurl3-gnutls \
libglib2.0-0 \
libgpgme11 \
libgnutls30 \
libjson-glib-1.0-0 \
libuuid1 \
libssh-gcrypt-4 \
libgpgme11 \
libhiredis0.14 \
libxml2 \
libpcap0.8 \
libnet1 \
libldap-common \
libradcli4 \
libnet1 \
libpaho-mqtt1.3 \
libpcap0.8 \
libradcli4 \
libssh-gcrypt-4 \
libuuid1 \
libxml2 \
&& rm -rf /var/lib/apt/lists/*

COPY --from=build /install/ /
Expand Down
25 changes: 12 additions & 13 deletions .github/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
#!/bin/sh
# This script installs openvas-smb-dependencies.
# This script installs gvm-libs dependencies
set -ex
apt-get update && \
apt-get install -y --no-install-recommends \
build-essential \
curl \
cmake \
pkg-config \
curl \
gnupg \
lcov \
libcjson-dev \
libcurl4-openssl-dev \
libjson-glib-dev \
libgcrypt-dev \
libglib2.0-dev \
libgpgme-dev \
libgnutls28-dev \
uuid-dev \
libgcrypt-dev \
libssh-dev \
libgpgme-dev \
libhiredis-dev \
libxml2-dev \
libpcap-dev \
libnet1-dev \
libldap2-dev \
libradcli-dev \
libnet1-dev \
libpaho-mqtt-dev \
lcov \
libpcap-dev \
libradcli-dev \
libssh-dev \
libxml2-dev \
pkg-config \
uuid-dev \
&& rm -rf /var/lib/apt/lists/*


Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Install prerequisites on Debian stable:
apt-get install \
cmake \
libcjson-dev \
libcurl4-openssl-dev \
libcurl4-gnutls-dev \
libgcrypt-dev \
libglib2.0-dev \
libgnutls28-dev \
Expand Down
Loading