Merge pull request #34 from fatalbanana/use_alma

Use AlmaLinux for centos builds

Author: vstakhov

centos-10/Dockerfile

@@ -1,16 +1,15 @@
-FROM oraclelinux:10-slim
+FROM almalinux:10
 
 RUN set -x; \
-  microdnf install dnf && \
-  dnf install "dnf-command(config-manager)" && \
-  dnf config-manager --set-enabled ol10_codeready_builder && \
-  dnf -qy install oracle-epel-release-el10 && \
+  dnf -y install "dnf-command(config-manager)" && \
+  dnf config-manager --set-enabled crb && \
+  dnf -qy install epel-release && \
   dnf -qy --setopt install_weak_deps=False upgrade-minimal && \
   dnf  -y --setopt install_weak_deps=False install git clang compiler-rt gcc gcc-c++ lld cmake make pkgconf-pkg-config wget \
   	libarchive-devel perl file-devel glib2-devel libicu-devel openssl-devel sqlite-devel zlib-devel \
   	clang-devel llvm-devel libsodium-devel rpm-build openblas-devel libunwind-devel lapack lapack-devel blas-devel blas pcre2-devel sudo binutils systemd patch \
-        gcc-c++ binutils systemd binutils-devel gcc-plugin-annobin \
-        git python3-devel && \
+        gcc-c++ binutils systemd binutils-devel gcc-plugin-annobin libasan \
+        python3-devel && \
   wget https://www.colm.net/files/ragel/ragel-6.10.tar.gz && rm -fr ragel-6.10 && \
   tar xvf ragel-6.10.tar.gz && (cd ragel-6.10 && ./configure --prefix=/usr && make -j4 && make install) && \
   rm -fr ragel-6.10 ; \
@@ -24,7 +23,7 @@ RUN set -x; \
   case "$rpmArch" in \
     *) \
        rm -fr /vectorscan-src/ ; \
-       dnf -qy install python3-devel boost-devel git && \
+       dnf -qy install python3-devel boost-devel && \
        git clone https://github.com/VectorCamp/vectorscan --depth 1 --branch vectorscan/5.4.12 /vectorscan-src && \
        (cd /vectorscan-src ; mkdir build ; cd build ; cmake .. -DCMAKE_INSTALL_PREFIX=/vectorscan -DCMAKE_BUILD_TYPE=Release -DFAT_RUNTIME=ON -DCMAKE_C_FLAGS="-fpic -fPIC" -DCMAKE_CXX_FLAGS="-fPIC -fpic" -DPCRE_SUPPORT_LIBBZ2=OFF; make -j4 ; make install) ; \
        rm -fr /vectorscan-src/ ; \

centos-8/Dockerfile

@@ -1,12 +1,11 @@
-FROM oraclelinux:8-slim
+FROM almalinux:8
 
 # clang-plugin build dependencies:
 #  * clang-devel
 #  * llvm-devel
 RUN set -x; \
-  microdnf install dnf && \
   dnf -qy install epel-release && \
-  dnf config-manager --set-enabled ol8_codeready_builder && \
+  dnf config-manager --set-enabled powertools && \
   dnf -qy --setopt install_weak_deps=False upgrade-minimal && \
   dnf  -y --setopt install_weak_deps=False install clang compiler-rt gcc gcc-c++ lld cmake make pkgconf-pkg-config wget \
   	libarchive-devel perl ragel file-devel glib2-devel libicu-devel openssl-devel sqlite-devel zlib-devel \
@@ -31,7 +30,7 @@ RUN set -x; \
        rm -fr /vectorscan-src/ ; \
       ;; \
     *) \
-       dnf -qy install hyperscan-devel jemalloc-devel  ; \
+       dnf -qy install hyperscan-devel jemalloc  ; \
       ;; \
   esac && \
   rm /var/log/*.log && rm -r /var/cache/dnf 

centos-9/Dockerfile

@@ -1,9 +1,8 @@
-FROM oraclelinux:9-slim
+FROM almalinux:9
 
 RUN set -x; \
-  microdnf install dnf && \
   dnf -qy install epel-release && \
-  dnf config-manager --set-enabled ol9_codeready_builder && \
+  dnf config-manager --set-enabled crb && \
   dnf -qy --setopt install_weak_deps=False upgrade-minimal && \
   dnf  -y --setopt install_weak_deps=False install clang compiler-rt gcc gcc-c++ lld cmake make pkgconf-pkg-config wget \
   	libarchive-devel perl ragel file-devel glib2-devel libicu-devel openssl-devel sqlite-devel zlib-devel \
@@ -29,7 +28,7 @@ RUN set -x; \
        rm -fr /vectorscan-src/ ; \
       ;; \
     *) \
-       dnf -qy install hyperscan-devel jemalloc-devel git python3-devel \
+       dnf -qy install hyperscan-devel jemalloc git python3-devel \
       ;; \
   esac && \
   rm /var/log/*.log && rm -r /var/cache/dnf