diff --git a/Dockerfile.rhel b/Dockerfile.rhel index ddbc487..e56bd4a 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -14,18 +14,22 @@ ENV RPMINSPECT_CONFIG=/usr/share/rpminspect/redhat.yaml RUN cd /etc/yum.repos.d/ && \ curl -L -O https://download.devel.redhat.com/rel-eng/RCMTOOLS/rcm-tools-rhel-9-baseos.repo -# Add COPR reposiroty with rpminspect +# Add COPR repository with rpminspect RUN cd /etc/yum.repos.d/ && \ curl -L -O https://copr.fedorainfracloud.org/coprs/g/osci/rpminspect/repo/epel-9/group_osci-rpminspect-epel-9.repo -# Add COPR reposiroty with rpminspect data package +# Add COPR repository with rpminspect data package RUN cd /etc/yum.repos.d/ && \ curl -L -O https://copr.devel.redhat.com/coprs/dcantrell/rpminspect-data-redhat/repo/epel-9/dcantrell-rpminspect-data-redhat-epel-9.repo -# Add COPR reposiroty with rpminspect data package dependencies +# Add COPR repository with rpminspect data package dependencies RUN cd /etc/yum.repos.d/ && \ curl -L -O https://copr.fedorainfracloud.org/coprs/g/osci/rpminspect-data-deps/repo/epel-9/group_osci-rpminspect-data-deps-epel-9.repo +# Add COPR repository with latest fedora-license-data +RUN cd /etc/yum.repos.d/ && \ + curl -L -O https://copr.fedorainfracloud.org/coprs/g/osci/fedora-license-data/repo/epel-9/group_osci-fedora-license-data-epel-9.repo + # Update and install dependencies RUN dnf -y update &&\ dnf -y install --enablerepo=rhel-9-buildroot \ diff --git a/rpminspect_runner.sh b/rpminspect_runner.sh index 49afadd..df7c40d 100755 --- a/rpminspect_runner.sh +++ b/rpminspect_runner.sh @@ -231,7 +231,7 @@ fi #dnf update -y annobin* > update_annobin.log 2>&1 || : # Update the data package, but from COPR, not from the official Fedora repositories -dnf update --disablerepo="fedora*" -y ${RPMINSPECT_PACKAGE_NAME} ${RPMINSPECT_DATA_PACKAGE_NAME} > update_rpminspect.log 2>&1 || : +dnf -y update --disablerepo="fedora*" "${RPMINSPECT_PACKAGE_NAME}" "${RPMINSPECT_DATA_PACKAGE_NAME}" fedora-license-data > update_rpminspect.log 2>&1 || : output_filename=${TMT_TEST_DATA:-.}/result.json verbose_log=${TMT_TEST_DATA:-.}/verbose.log