From a9545c03787b4ba3e566edf9ecfce7d9c26d1eef Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Tue, 23 Feb 2021 21:49:26 -0800 Subject: [PATCH] Minor Fedora 32/33 updates in CI - Switch Fedora package management from yum to dnf, the default - Minimize set of requested RPMs --- ci/fedora-32/Dockerfile | 6 ++---- ci/fedora-33/Dockerfile | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ci/fedora-32/Dockerfile b/ci/fedora-32/Dockerfile index 87e072753c..1268699b97 100644 --- a/ci/fedora-32/Dockerfile +++ b/ci/fedora-32/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:32 -RUN yum -y install \ +RUN dnf -y install \ bison \ cmake \ diffutils \ @@ -11,15 +11,13 @@ RUN yum -y install \ gcc-c++ \ libpcap-devel \ make \ - openssl \ openssl-devel \ - python3 \ python3-devel \ python3-pip\ sqlite \ swig \ which \ zlib-devel \ - && yum clean all && rm -rf /var/cache/yum + && dnf clean all && rm -rf /var/cache/dnf RUN pip3 install junit2html diff --git a/ci/fedora-33/Dockerfile b/ci/fedora-33/Dockerfile index 15d5f9244e..5717313760 100644 --- a/ci/fedora-33/Dockerfile +++ b/ci/fedora-33/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:33 -RUN yum -y install \ +RUN dnf -y install \ bison \ cmake \ diffutils \ @@ -11,15 +11,13 @@ RUN yum -y install \ gcc-c++ \ libpcap-devel \ make \ - openssl \ openssl-devel \ - python3 \ python3-devel \ python3-pip\ sqlite \ swig \ which \ zlib-devel \ - && yum clean all && rm -rf /var/cache/yum + && dnf clean all && rm -rf /var/cache/dnf RUN pip3 install junit2html