From 23b0567e623d909435538b9a25f855496905efa7 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Tue, 23 Feb 2021 21:15:02 -0800 Subject: [PATCH 1/2] Add CentOS Stream 8 to CI There's no official Docker image on the Docker Hub, it's on quay.io: https://quay.io/repository/centos/centos?tab=tags At the moment, "Stream" and "Stream 8" are synonymous. --- .cirrus.yml | 7 +++++++ ci/centos-stream-8/Dockerfile | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 ci/centos-stream-8/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index 5d223c089c..6cde730bb3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -104,6 +104,13 @@ fedora32_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE +centosstream8_task: + container: + # Stream 8 support should be 5 years, so until 2024. but I cannot find a concrete timeline --cpk + dockerfile: ci/centos-stream-8/Dockerfile + << : *RESOURCES_TEMPLATE + << : *CI_TEMPLATE + centos8_task: container: # CentOS 8 EOL: May 31, 2029 diff --git a/ci/centos-stream-8/Dockerfile b/ci/centos-stream-8/Dockerfile new file mode 100644 index 0000000000..c2b6b4d3aa --- /dev/null +++ b/ci/centos-stream-8/Dockerfile @@ -0,0 +1,23 @@ +FROM quay.io/centos/centos:stream8 + +RUN dnf config-manager --set-enabled powertools + +RUN dnf -y install \ + bison \ + cmake \ + diffutils \ + flex \ + git \ + gcc \ + gcc-c++ \ + libpcap-devel \ + make \ + openssl-devel \ + python3-devel \ + python3-pip\ + sqlite \ + swig \ + zlib-devel \ + && dnf clean all && rm -rf /var/cache/dnf + +RUN pip3 install junit2html From a9545c03787b4ba3e566edf9ecfce7d9c26d1eef Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Tue, 23 Feb 2021 21:49:26 -0800 Subject: [PATCH 2/2] 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