7.0: update to Suricata 7.0.8

Sync some differences between the Arm64 and Amd64 Dockerfiles, these can
probably become the same now.

7.0/Dockerfile.amd64

@@ -1,4 +1,4 @@
-FROM docker.io/amd64/almalinux:9 AS builder
+FROM almalinux:9 AS builder
 
 RUN \
         dnf -y update && \
@@ -49,7 +49,7 @@ RUN dnf -y install \
         zlib-devel
 
 RUN if [ "$(arch)" = "x86_64" ]; then \
-       dnf -y install https://kojipkgs.fedoraproject.org/packages/hyperscan/5.4.0/4.el9/x86_64/hyperscan-5.4.0-4.el9.x86_64.rpm https://kojipkgs.fedoraproject.org/packages/hyperscan/5.4.0/4.el9/x86_64/hyperscan-devel-5.4.0-4.el9.x86_64.rpm; \
+    dnf -y install hyperscan; \
 fi
 
 ARG VERSION
@@ -93,7 +93,7 @@ RUN make install install-conf DESTDIR=/fakeroot
 # next stage.
 RUN rm -rf /fakeroot/var
 
-FROM docker.io/almalinux/amd64:9-base AS runner
+FROM almalinux/9-base:latest AS runner
 
 RUN \
         dnf -y update && \
@@ -131,7 +131,7 @@ RUN \
         tcpdump \
         which \
         zlib && \
-        if [ "$(arch)" = "x86_64" ]; then dnf -y install https://kojipkgs.fedoraproject.org/packages/hyperscan/5.4.0/4.el9/x86_64/hyperscan-5.4.0-4.el9.x86_64.rpm; fi && \
+        if [ "$(arch)" = "x86_64" ]; then dnf -y install hyperscan; fi && \
         dnf clean all && \
         find /etc/logrotate.d -type f -not -name suricata -delete
 

7.0/Dockerfile.arm64

@@ -2,16 +2,18 @@ FROM almalinux:9 AS builder
 
 ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
 
-RUN dnf -y update
-RUN dnf -y install epel-release dnf-plugins-core
-RUN dnf config-manager --set-enabled crb
+RUN \
+        dnf -y update && \
+        dnf -y install epel-release dnf-plugins-core && \
+        dnf config-manager --set-enabled crb
 
 RUN dnf -y install \
         autoconf \
         automake \
         cargo \
         cbindgen \
         diffutils \
+        dpdk-devel \
         elfutils-libelf-devel \
         file \
         file-devel \
@@ -39,6 +41,7 @@ RUN dnf -y install \
         nspr-devel \
         nss-devel \
         nss-softokn-devel \
+        numactl-devel \
         pcre2-devel \
         pkgconfig \
         python3-devel \
@@ -48,7 +51,7 @@ RUN dnf -y install \
         zlib-devel
 
 RUN if [ "$(arch)" = "x86_64" ]; then \
-       dnf -y install hyperscan-devel; \
+    dnf -y install hyperscan; \
 fi
 
 ARG VERSION
@@ -79,6 +82,7 @@ RUN ./configure \
         --enable-hiredis \
         --enable-geoip \
         --enable-ebpf \
+	--enable-dpdk \
         ${CONFIGURE_ARGS}
 
 ARG CORES=2
@@ -98,6 +102,7 @@ RUN \
         dnf -y install epel-release && \
         dnf -y install \
         cronie \
+	dpdk \
         elfutils-libelf \
         file \
         findutils \
@@ -120,6 +125,7 @@ RUN \
         net-tools \
         nss \
         nss-softokn \
+        numactl \
         pcre2 \
         procps-ng \
         python3 \
@@ -159,3 +165,6 @@ VOLUME /etc/suricata
 
 COPY /docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]
+
+RUN /usr/bin/suricata --build-info
+

7.0/VERSION

@@ -1 +1 @@
-7.0.7
+7.0.8