SBOM: Generate Rust dependencies for the recursor

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index f1fdfe672b8128288dd42420a36be3a18aab80d8..8680275cdeafc9e11e5266816fbfcdebd44fcfff 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -16,7 +16,9 @@ ADD builder/helpers/ /pdns/builder/helpers/
 ADD builder-support/helpers/ /pdns/builder-support/helpers/
 
 @IF [ -n "$M_recursor$M_all" ]
-RUN cd /pdns/builder-support/helpers/ && ./install_rust.sh && \
+RUN cd /pdns/builder-support/helpers/ && ./install_rust.sh
+RUN cd /pdns/builder-support/helpers/ && ./install_cargo_cyclonedx.sh
+RUN cd /pdns/builder-support/helpers/ && \
     yum install -y git cmake clang
 RUN cd /pdns/builder-support/helpers/ && ./install_meson.sh
 @ENDIF
@@ -56,6 +58,13 @@ RUN touch /var/lib/rpm/* && if grep -q 'release 8' /etc/redhat-release; then \
     else \
       builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \
     fi
+RUN cd /tmp && \
+  tar xf /sdist/pdns-recursor-${BUILDER_VERSION}.tar.xz && \
+  cd pdns-recursor-${BUILDER_VERSION}/rec-rust-lib/ && \
+  python3 generate.py ./ ./ && \
+  cd rust && \
+  /bin/cargo-cyclonedx cyclonedx -f json --spec-version 1.5 && \
+  cp recrust.cdx.json /dist/
 @ENDIF
 
 @IF [ -n "$M_dnsdist$M_all" ]
@@ -66,7 +75,6 @@ RUN touch /var/lib/rpm/* && if grep -q 'release 8' /etc/redhat-release; then \
     fi
 RUN cd /tmp && \
   tar xf /sdist/dnsdist-${BUILDER_VERSION}.tar.xz && \
-  ls -l && \
   cd dnsdist-${BUILDER_VERSION}/dnsdist-rust-lib/ && \
   python3 dnsdist-settings-generator.py ../ ./ ../ && \
   cd rust && \

diff --git a/builder-support/dockerfiles/Dockerfile.rpmsbom b/builder-support/dockerfiles/Dockerfile.rpmsbom
index 1b6c8d7e36ba86624d06d97b62673775363afe11..05a2ec1c6d32b871168e18a16a829b6c9f597ebe 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.rpmsbom
+++ b/builder-support/dockerfiles/Dockerfile.rpmsbom
@@ -7,7 +7,7 @@ ADD builder-support/helpers/ /pdns/builder-support/helpers/
 
 @IF [ -n "$M_recursor$M_all" ]
 RUN cd /pdns/builder-support/helpers/ && \
-    python3 generate-sbom-dnf.py /dist/pdns-recursor-${BUILDER_VERSION}-${BUILDER_TARGET}.cyclonedx.json pdns-recursor rust.json
+    python3 generate-sbom-dnf.py /dist/pdns-recursor-${BUILDER_VERSION}-${BUILDER_TARGET}.cyclonedx.json pdns-recursor rust.json /dist/recrust.cdx.json
 @ENDIF
 
 @IF [ -n "$M_dnsdist$M_all" ]