Skip to content

Commit

Permalink
Adjust the container definition to work when the dnf command is dnf5
Browse files Browse the repository at this point in the history
  • Loading branch information
jan-kolarik committed May 10, 2024
1 parent 2ac8e6e commit a098008
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
12 changes: 4 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,12 @@ RUN set -x && \
# Copy extra repo files
COPY ./repos.d/ /etc/yum.repos.d/

# enable the test-utils repo
RUN set -x && \
dnf -y --refresh upgrade; \
dnf -y install dnf-plugins-core; \
dnf -y copr enable rpmsoftwaremanagement/test-utils;

# enable dnf5
RUN set -x && \
dnf -y copr enable rpmsoftwaremanagement/dnf-nightly; \
dnf -y install dnf5-plugins; \
dnf -y --refresh upgrade; \
dnf -y install dnf5 dnf5-plugins; \
dnf5 -y copr enable rpmsoftwaremanagement/test-utils; \
dnf5 -y copr enable rpmsoftwaremanagement/dnf-nightly; \
# run upgrade before distro-sync in case there is a new version in dnf-nightly that has a new dependency
dnf5 -y upgrade; \
dnf5 -y distro-sync --repo copr:copr.fedorainfracloud.org:rpmsoftwaremanagement:dnf-nightly;
Expand Down
1 change: 1 addition & 0 deletions dnf-behave-tests/requirements.spec
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ BuildRequires: openssl
BuildRequires: python3
BuildRequires: python3-distro
BuildRequires: python3-pip
BuildRequires: python3-rpm
# a missing dep of python3-pip on f35 beta, remove when unneeded
BuildRequires: python3-setuptools
BuildRequires: python3-toml
Expand Down

0 comments on commit a098008

Please sign in to comment.