Skip to content

Commit

Permalink
Install fedora-license-data from Copr and update it during run
Browse files Browse the repository at this point in the history
  • Loading branch information
jpopelka committed Feb 20, 2024
1 parent 4bd8efd commit c6190aa
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 7 additions & 3 deletions Dockerfile.rhel
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion rpminspect_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c6190aa

Please sign in to comment.