From fef1b1c63e150b34a391bc836596657ec068de81 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Tue, 26 Mar 2024 10:47:11 +0100 Subject: [PATCH] Fix syntax errors --- builder-support/dockerfiles/Dockerfile.rpmsbom | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builder-support/dockerfiles/Dockerfile.rpmsbom b/builder-support/dockerfiles/Dockerfile.rpmsbom index 5d59b4e734..15bd4f912d 100644 --- a/builder-support/dockerfiles/Dockerfile.rpmsbom +++ b/builder-support/dockerfiles/Dockerfile.rpmsbom @@ -1,8 +1,10 @@ -# No SBOM on el-7, which only has Python 2 and will be EOL soon anyway +ARG BUILDER_VERSION +ARG BUILDER_TARGET +# No SBOM on el-7, which only has Python 2 and will be EOL soon anyway RUN touch /var/lib/rpm/* && \ if ! $(grep -q 'release 7' /etc/redhat-release); then \ - yum upgrade -y && yum install -y python3 python3-dnf; \ + yum install -y python3 python3-dnf; \ fi ADD builder-support/helpers/ /pdns/builder-support/helpers/ @@ -25,6 +27,6 @@ RUN cd /pdns/builder-support/helpers/ && \ if ! $(grep -q 'release 7' /etc/redhat-release); then \ for pkg in pdns pdns-backend-geoip pdns-backend-ldap pdns-backend-lmdb pdns-backend-lua2 pdns-backend-mysql pdns-backend-odbc pdns-backend-postgresql pdns-backend-remote pdns-backend-sqlite pdns-backend-tinydns pdns-backend-ixfrdist pdns-tools; do \ python3 generate-sbom-dnf.py /dist/${pkg}-${BUILDER_VERSION}-${BUILDER_TARGET}.cyclonedx.json ${pkg}; \ - done ; \ - fi \ + done; \ + fi @ENDIF -- 2.47.2