From 88cc254db4dc6d6792168df4699bfa972c513eb3 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Mon, 17 Feb 2025 17:20:25 +0100 Subject: [PATCH] dnsdist: Remove h2o from our packages --- builder-support/dockerfiles/Dockerfile.rpmbuild | 6 ------ builder-support/dockerfiles/Dockerfile.rpmsbom | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild index 7bc485fdcf..2a996f1a3f 100644 --- a/builder-support/dockerfiles/Dockerfile.rpmbuild +++ b/builder-support/dockerfiles/Dockerfile.rpmbuild @@ -51,12 +51,6 @@ RUN touch /var/lib/rpm/* && if grep -q 'release 8' /etc/redhat-release; then \ @ENDIF @IF [ -n "$M_dnsdist$M_all" ] - -RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \ - dnf install -y --allowerasing curl libcurl openssl-devel cmake && \ - cd /pdns/builder-support/helpers/ && \ - ./install_h2o.sh - RUN touch /var/lib/rpm/* && if grep -q 'release 8' /etc/redhat-release; then \ scl enable gcc-toolset-13 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \ else \ diff --git a/builder-support/dockerfiles/Dockerfile.rpmsbom b/builder-support/dockerfiles/Dockerfile.rpmsbom index 890a72df48..db54cbb325 100644 --- a/builder-support/dockerfiles/Dockerfile.rpmsbom +++ b/builder-support/dockerfiles/Dockerfile.rpmsbom @@ -12,7 +12,7 @@ RUN cd /pdns/builder-support/helpers/ && \ @IF [ -n "$M_dnsdist$M_all" ] RUN cd /pdns/builder-support/helpers/; \ - python3 generate-sbom-dnf.py /dist/dnsdist-${BUILDER_VERSION}-${BUILDER_TARGET}.cyclonedx.json dnsdist rust.json quiche.json h2o.json + python3 generate-sbom-dnf.py /dist/dnsdist-${BUILDER_VERSION}-${BUILDER_TARGET}.cyclonedx.json dnsdist rust.json quiche.json @ENDIF @IF [ -n "$M_authoritative$M_all" ] -- 2.47.2