Minor Fedora 32/33 updates in CI

- Switch Fedora package management from yum to dnf, the default
- Minimize set of requested RPMs
This commit is contained in:
Christian Kreibich 2021-02-23 21:49:26 -08:00
parent 23b0567e62
commit a9545c0378
2 changed files with 4 additions and 8 deletions

View file

@ -1,6 +1,6 @@
FROM fedora:32 FROM fedora:32
RUN yum -y install \ RUN dnf -y install \
bison \ bison \
cmake \ cmake \
diffutils \ diffutils \
@ -11,15 +11,13 @@ RUN yum -y install \
gcc-c++ \ gcc-c++ \
libpcap-devel \ libpcap-devel \
make \ make \
openssl \
openssl-devel \ openssl-devel \
python3 \
python3-devel \ python3-devel \
python3-pip\ python3-pip\
sqlite \ sqlite \
swig \ swig \
which \ which \
zlib-devel \ zlib-devel \
&& yum clean all && rm -rf /var/cache/yum && dnf clean all && rm -rf /var/cache/dnf
RUN pip3 install junit2html RUN pip3 install junit2html

View file

@ -1,6 +1,6 @@
FROM fedora:33 FROM fedora:33
RUN yum -y install \ RUN dnf -y install \
bison \ bison \
cmake \ cmake \
diffutils \ diffutils \
@ -11,15 +11,13 @@ RUN yum -y install \
gcc-c++ \ gcc-c++ \
libpcap-devel \ libpcap-devel \
make \ make \
openssl \
openssl-devel \ openssl-devel \
python3 \
python3-devel \ python3-devel \
python3-pip\ python3-pip\
sqlite \ sqlite \
swig \ swig \
which \ which \
zlib-devel \ zlib-devel \
&& yum clean all && rm -rf /var/cache/yum && dnf clean all && rm -rf /var/cache/dnf
RUN pip3 install junit2html RUN pip3 install junit2html