Skip to content

Commit

Permalink
*: Disable fedora-cisco-openh264 repository
Browse files Browse the repository at this point in the history
  • Loading branch information
travier committed May 7, 2024
1 parent 99289ac commit 6c6ef1e
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 6 deletions.
1 change: 1 addition & 0 deletions filebrowser/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ FROM registry.fedoraproject.org/fedora:40

# Remove unneeded packages and remove all SUID/SGID binaries
RUN rm /etc/dnf/protected.d/sudo.conf && \
sed -i "s/enabled=1/enabled=0/" /etc/yum.repos.d/fedora-cisco-openh264.repo && \
dnf -y remove pam shadow-utils sudo && \
dnf -y update && \
dnf clean all && \
Expand Down
3 changes: 2 additions & 1 deletion libvirtd/Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM registry.fedoraproject.org/fedora:40

RUN dnf -y update && \
RUN sed -i "s/enabled=1/enabled=0/" /etc/yum.repos.d/fedora-cisco-openh264.repo && \
dnf -y update && \
dnf -y install --nodocs \
libvirt-daemon \
libvirt-daemon-config-network \
Expand Down
1 change: 1 addition & 0 deletions nginx/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ FROM registry.fedoraproject.org/fedora:40

# Install nginx, remove unneeded packages and remove all SUID/SGID binaries
RUN rm /etc/dnf/protected.d/sudo.conf && \
sed -i "s/enabled=1/enabled=0/" /etc/yum.repos.d/fedora-cisco-openh264.repo && \
dnf -y remove pam sudo && \
dnf -y update && \
dnf -y install nginx && \
Expand Down
1 change: 1 addition & 0 deletions php-fpm-ttrss/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ FROM registry.fedoraproject.org/fedora:40

# Install php and required modules, remove unneeded packages and remove all SUID/SGID binaries
RUN rm /etc/dnf/protected.d/sudo.conf && \
sed -i "s/enabled=1/enabled=0/" /etc/yum.repos.d/fedora-cisco-openh264.repo && \
dnf -y remove pam sudo && \
dnf -y update && \
dnf -y install git php-cli php-fpm \
Expand Down
1 change: 1 addition & 0 deletions quasselcore/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ FROM registry.fedoraproject.org/fedora:40

# Install quasselcore, remove unneeded packages and remove all SUID/SGID binaries
RUN rm /etc/dnf/protected.d/sudo.conf && \
sed -i "s/enabled=1/enabled=0/" /etc/yum.repos.d/fedora-cisco-openh264.repo && \
dnf -y remove pam sudo && \
dnf -y update && \
dnf -y install quassel-core && \
Expand Down
3 changes: 2 additions & 1 deletion toolbox-kdedev/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ FROM registry.fedoraproject.org/fedora-toolbox:40
# - Install build deps for Discover development. This will ignore errors
# encountered during flatpak installation.
# - Remove mlocate
RUN dnf -y distrosync \
RUN sed -i "s/enabled=1/enabled=0/" /etc/yum.repos.d/fedora-cisco-openh264.repo \
&& dnf -y distrosync \
&& dnf -y install \
bind-utils \
fd-find \
Expand Down
6 changes: 4 additions & 2 deletions toolbox-root/Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM registry.fedoraproject.org/fedora:40 AS builder

RUN dnf update -y && \
RUN sed -i "s/enabled=1/enabled=0/" /etc/yum.repos.d/fedora-cisco-openh264.repo && \
dnf update -y && \
dnf install -y rust cargo && \
cargo install bandwhich
RUN mv /root/.cargo/bin/bandwhich /
Expand All @@ -12,7 +13,8 @@ COPY --from=builder /bandwhich /usr/local/bin/bandwhich

# - Only install tools that need root access
# - Ensure that mlocate is removed
RUN dnf -y distrosync && \
RUN sed -i "s/enabled=1/enabled=0/" /etc/yum.repos.d/fedora-cisco-openh264.repo && \
dnf -y distrosync && \
dnf -y install \
bwm-ng \
htop \
Expand Down
3 changes: 2 additions & 1 deletion toolbox-texlive/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ FROM registry.fedoraproject.org/fedora-toolbox:40
# - Install common development tools
# - Install texlive packages
# - Remove mlocate
RUN dnf -y distrosync && \
RUN sed -i "s/enabled=1/enabled=0/" /etc/yum.repos.d/fedora-cisco-openh264.repo && \
dnf -y distrosync && \
dnf -y install \
ImageMagick \
brotli \
Expand Down
3 changes: 2 additions & 1 deletion toolbox/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ FROM registry.fedoraproject.org/fedora-toolbox:40
# - Install virt-manager and virt-install
# - Install Cloud command line tools (disabled)
# - Remove mlocate
RUN dnf -y distrosync \
RUN sed -i "s/enabled=1/enabled=0/" /etc/yum.repos.d/fedora-cisco-openh264.repo \
&& dnf -y distrosync \
&& dnf -y install \
bind-utils \
fd-find \
Expand Down
1 change: 1 addition & 0 deletions unbound/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ FROM registry.fedoraproject.org/fedora:40

# Install unbound, remove unneeded packages and remove all SUID/SGID binaries
RUN rm /etc/dnf/protected.d/sudo.conf && \
sed -i "s/enabled=1/enabled=0/" /etc/yum.repos.d/fedora-cisco-openh264.repo && \
dnf -y remove pam sudo && \
dnf -y update && \
dnf -y install unbound && \
Expand Down

0 comments on commit 6c6ef1e

Please sign in to comment.