Unpin the libmodulemd RPMs

This commit is contained in:
mprahl
2019-09-13 08:30:54 -04:00
parent 52e88ba3ff
commit f8e4daae9f
2 changed files with 4 additions and 6 deletions

View File

@@ -4,7 +4,7 @@ WORKDIR /build
RUN yum -y update
RUN yum -y install epel-release yum-utils
RUN yum-config-manager --add-repo https://kojipkgs.fedoraproject.org/repos-dist/epel7Server-infra/latest/x86_64/
# Replace the pinned libmodulemd RPMs with python2-libmodulemd2 after https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2019-e093131fa7
# Remove libmodulemd1 after the following ticket is resolved https://pagure.io/fedora-infrastructure/issue/8206
RUN yum -y install \
--nogpgcheck \
--setopt=deltarpm=0 \
@@ -19,6 +19,7 @@ RUN yum -y install \
git \
kobo \
kobo-rpmlib \
libmodulemd1 \
python-backports-ssl_match_hostname \
python-dnf \
python-dogpile-cache \
@@ -30,8 +31,7 @@ RUN yum -y install \
python-futures \
python-koji \
python-ldap3 \
https://kojipkgs.fedoraproject.org//packages/libmodulemd2/2.8.0/2.el7/x86_64/libmodulemd2-2.8.0-2.el7.x86_64.rpm \
https://kojipkgs.fedoraproject.org//packages/libmodulemd2/2.8.0/2.el7/x86_64/python2-libmodulemd2-2.8.0-2.el7.x86_64.rpm \
python2-libmodulemd2 \
python-mock \
python-munch \
python-pip \

View File

@@ -1,7 +1,6 @@
FROM fedora:29
WORKDIR /build
# Replace the pinned libmodulemd RPMs with python3-libmodulemd after https://bodhi.fedoraproject.org/updates/FEDORA-2019-ccf39d5166
RUN dnf -y install \
--nogpgcheck \
--setopt=deltarpm=0 \
@@ -21,8 +20,7 @@ RUN dnf -y install \
python3-flask-sqlalchemy \
python3-koji \
python3-ldap3 \
https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.8.0/1.fc29/x86_64/libmodulemd-2.8.0-1.fc29.x86_64.rpm \
https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.8.0/1.fc29/x86_64/python3-libmodulemd-2.8.0-1.fc29.x86_64.rpm \
python3-libmodulemd \
python3-munch \
python3-pip \
python3-prometheus_client \