Skip to content

Commit

Permalink
Disable fedora-cisco repository in our containers
Browse files Browse the repository at this point in the history
We need to disable these repositories to avoid dependencies from it.

With this changeset we depends on gnome-remote-desktop which depends on
librdp which depends (Fedora only) on openh264. However, if fedora-cisco
repository is not enabled it will instead install noopenh264 package
which is a stub package in the main repositories.
  • Loading branch information
jkonecny12 committed Sep 25, 2024
1 parent d963400 commit da20f70
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
4 changes: 4 additions & 0 deletions dockerfile/anaconda-ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ COPY ["anaconda.spec.in", "requirements.txt", "/root/"]

# Prepare environment and install build dependencies
RUN set -ex; \
# disable fedora-cisco repository otherwise freerdp will depend on openh264 from fedora-cisco
# if fedora-cisco is not enabled it will fallback to stub library in main repository which is
# what we want
sed -i 's/enabled=1/enabled=0/' /etc/yum.repos.d/fedora-cisco-openh264.repo; \
dnf install -y \
'dnf5-command(copr)'; \
# Enable COPR repositories
Expand Down
4 changes: 4 additions & 0 deletions dockerfile/anaconda-release/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ LABEL [email protected]
# Add missing dependencies required to do the build.
RUN set -e; \
dnf update -y; \
# disable fedora-cisco repository otherwise freerdp will depend on openh264 from fedora-cisco
# if fedora-cisco is not enabled it will fallback to stub library in main repository which is
# what we want
sed -i 's/enabled=1/enabled=0/' /etc/yum.repos.d/fedora-cisco-openh264.repo; \
dnf install -y \
git \
python3-pip; \
Expand Down
4 changes: 4 additions & 0 deletions dockerfile/anaconda-rpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ COPY ["anaconda.spec.in", "/root/"]

# Prepare environment and install build dependencies
RUN set -ex; \
# disable fedora-cisco repository otherwise freerdp will depend on openh264 from fedora-cisco
# if fedora-cisco is not enabled it will fallback to stub library in main repository which is
# what we want
sed -i 's/enabled=1/enabled=0/' /etc/yum.repos.d/fedora-cisco-openh264.repo; \
dnf update -y; \
# Install dependencies
dnf install -y \
Expand Down

0 comments on commit da20f70

Please sign in to comment.