Unpin the libmodulemd RPMs

This commit is contained in:
mprahl
2019-05-15 14:31:11 -04:00
parent dde4b96baf
commit c1e2a5b0af
4 changed files with 7 additions and 27 deletions

View File

@@ -10,13 +10,10 @@ ARG DNF_CMD="dnf -y --setopt=deltarpm=0 --setopt=install_weak_deps=false --setop
COPY . /src
WORKDIR /src
# Unpin the libmodulemd RPMs once MBS is released with libmodulemd v2
# TODO: Unpin the `python3-libmodulemd` RPM once MBS is released with libmodulemd v2
RUN ${DNF_CMD} install \
'dnf-command(builddep)' rpm-build rpmdevtools rpmlint \
python3-tox python3-pytest python3-mock python3-flake8 bandit \
https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/python3-libmodulemd-2.4.0-1.fc29.x86_64.rpm \
https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd-2.4.0-1.fc29.x86_64.rpm \
https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd1-1.8.10-1.fc29.x86_64.rpm && \
python3-tox python3-pytest python3-mock python3-flake8 bandit python3-libmodulemd && \
${DNF_CMD} builddep *.spec && \
${DNF_CMD} clean all
RUN rpmdev-setuptree && \
@@ -46,15 +43,13 @@ LABEL \
COPY --from=builder /srv/RPMS /srv/RPMS
COPY repos/ /etc/yum.repos.d/
# Unpin the libmodulemd RPMs once MBS is released with libmodulemd v2
# TODO: Unpin the `python3-libmodulemd` RPM once MBS is released with libmodulemd v2
RUN $DNF_CMD install \
python3-psycopg2 \
python3-docopt \
python3-service-identity \
/srv/*/*/*.rpm \
https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/python3-libmodulemd-2.4.0-1.fc29.x86_64.rpm \
https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd-2.4.0-1.fc29.x86_64.rpm \
https://kojipkgs.fedoraproject.org//packages/libmodulemd/2.4.0/1.fc29/x86_64/libmodulemd1-1.8.10-1.fc29.x86_64.rpm \
python3-libmodulemd \
$EXTRA_RPMS && \
$DNF_CMD clean all && \
rm -rf /srv/RPMS