Merge branch 'main' into GEA-624_Implement_matching_of_CPEs_to_rules_…

…as_used_in_CVEs
greenbone · Aug 7, 2024 · 993c9c4 · 993c9c4
2 parents 1d61c2f + 3a54606
commit 993c9c4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/.docker/prod-oldstable.Dockerfile b/.docker/prod-oldstable.Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update && \
   cmake \
   pkg-config \
   gnupg \
+  libcjson-dev \
   libglib2.0-dev \
   libgpgme-dev \
   libgnutls28-dev \

diff --git a/.docker/prod-testing.Dockerfile b/.docker/prod-testing.Dockerfile
@@ -16,6 +16,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \
+  libcjson1 \
   libglib2.0-0 \
   libgpgme11 \
   libgnutls30 \

diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile
@@ -16,6 +16,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \
+  libcjson1 \
   libglib2.0-0 \
   libgpgme11 \
   libgnutls30 \

diff --git a/.github/install-dependencies.sh b/.github/install-dependencies.sh
@@ -8,6 +8,7 @@ apt-get update && \
   cmake \
   pkg-config \
   gnupg \
+  libcjson-dev \
   libglib2.0-dev \
   libgpgme-dev \
   libgnutls28-dev \

diff --git a/INSTALL.md b/INSTALL.md
@@ -17,6 +17,7 @@ General build environment:
 * pkg-config
 
 Specific development libraries:
+* libcjson >= 1.7.14 (util)
 * libglib >= 2.42 (all)
 * libgio >= 2.42 (util)
 * zlib >= 1.2.8 (util)