Merge remote-tracking branch 'origin/topic/awelzel/docker-trixie'

* origin/topic/awelzel/docker-trixie:
  ci: Run zeekctl and builtin tasks with Debian 13, too
  ci: Prepend timestamps to output
  ci: Enable Spicy for arm_debian13
  ci: Add Debian 13.0 (trixie)
  docker: Bump to debian:trixie-slim

(cherry picked from commit 63574b9fd4)

.cirrus.yml

@@ -142,6 +142,7 @@ ci_template: &CI_TEMPLATE
 
 env:
   CIRRUS_WORKING_DIR: /zeek
+  CIRRUS_LOG_TIMESTAMP: true
   ZEEK_CI_CPUS: *CPUS
   ZEEK_CI_BTEST_JOBS: *BTEST_JOBS
   ZEEK_CI_BTEST_RETRIES: *BTEST_RETRIES
@@ -208,51 +209,49 @@ centosstream9_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
-debian12_task:
+debian13_task:
   container:
-    # Debian 12 (bookworm) EOL: TBD
+    # Debian 13 (trixie) EOL: TBD
-    dockerfile: ci/debian-12/Dockerfile
+    dockerfile: ci/debian-13/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
-arm_debian12_task:
+arm_debian13_task:
   arm_container:
-    # Debian 12 (bookworm) EOL: TBD
+    # Debian 13 (trixie) EOL: TBD
-    dockerfile: ci/debian-12/Dockerfile
+    dockerfile: ci/debian-13/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
-  env:
-    ZEEK_CI_CONFIGURE_FLAGS: *NO_SPICY_CONFIG
 
-debian12_static_task:
+debian13_static_task:
   container:
     # Just use a recent/common distro to run a static compile test.
-    # Debian 12 (bookworm) EOL: TBD
+    # Debian 13 (trixie) EOL: TBD
-    dockerfile: ci/debian-12/Dockerfile
+    dockerfile: ci/debian-13/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
   << : *SKIP_TASK_ON_PR
   env:
     ZEEK_CI_CONFIGURE_FLAGS: *STATIC_CONFIG
 
-debian12_binary_task:
+debian13_binary_task:
   container:
     # Just use a recent/common distro to run binary mode compile test.
     # As of 2024-03, the used configure flags are equivalent to the flags
     # that we use to create binary packages.
     # Just use a recent/common distro to run a static compile test.
-    # Debian 12 (bookworm) EOL: TBD
+    # Debian 13 (trixie) EOL: TBD
-    dockerfile: ci/debian-12/Dockerfile
+    dockerfile: ci/debian-13/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
   << : *SKIP_TASK_ON_PR
   env:
     ZEEK_CI_CONFIGURE_FLAGS: *BINARY_CONFIG
 
-debian11_task:
+debian12_task:
   container:
-    # Debian 11 EOL: June 2026
+    # Debian 12 (bookworm) EOL: TBD
-    dockerfile: ci/debian-11/Dockerfile
+    dockerfile: ci/debian-12/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
   << : *SKIP_TASK_ON_PR
@@ -797,8 +796,8 @@ zeekctl_debian12_task:
         $CIRRUS_BRANCH =~ 'release/.*' )
     )
   container:
-    # Debian 12 (bookworm) EOL: TBD
+    # Debian 13 (trixie) EOL: TBD
-    dockerfile: ci/debian-12/Dockerfile
+    dockerfile: ci/debian-13/Dockerfile
     << : *RESOURCES_TEMPLATE
   sync_submodules_script: git submodule update --recursive --init
   always:
@@ -821,8 +820,8 @@ include_plugins_debian12_task:
   cpu: *CPUS
   memory: *MEMORY
   container:
-    # Debian 12 (bookworm) EOL: TBD
+    # Debian 13 (trixie) EOL: TBD
-    dockerfile: ci/debian-12/Dockerfile
+    dockerfile: ci/debian-13/Dockerfile
     << : *RESOURCES_TEMPLATE
   sync_submodules_script: git submodule update --recursive --init
   fetch_external_plugins_script:

CHANGES

@@ -1,3 +1,25 @@
+8.0.0-4 | 2025-08-22 09:21:32 -0700
+
+  * ci: Run zeekctl and builtin tasks with Debian 13, too (Arne Welzel, Corelight)
+
+    (cherry picked from commit 63574b9fd4645a2f21d7ba3388e16c1b4c55812d)
+
+  * ci: Prepend timestamps to output (Arne Welzel, Corelight)
+
+    (cherry picked from commit 63574b9fd4645a2f21d7ba3388e16c1b4c55812d)
+
+  * ci: Enable Spicy for arm_debian13 (Arne Welzel, Corelight)
+
+    (cherry picked from commit 63574b9fd4645a2f21d7ba3388e16c1b4c55812d)
+
+  * ci: Add Debian 13.0 (trixie) (Arne Welzel, Corelight)
+
+    (cherry picked from commit 63574b9fd4645a2f21d7ba3388e16c1b4c55812d)
+
+  * docker: Bump to debian:trixie-slim (Arne Welzel, Corelight)
+
+    (cherry picked from commit 63574b9fd4645a2f21d7ba3388e16c1b4c55812d)
+
 8.0.0-3 | 2025-08-22 09:18:56 -0700
 
   * Report PostgreSQL login success only after ReadyForQuery (Fupeng Zhao)

VERSION

@@ -1 +1 @@
-8.0.0-3
+8.0.0-4

ci/debian-13/Dockerfile

@@ -1,32 +1,36 @@
-FROM debian:11
+FROM debian:13
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
 # A version field to invalidate Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20241024
+ENV DOCKERFILE_VERSION 20250813
 
 RUN apt-get update && apt-get -y install \
     bison \
     bsdmainutils \
     ccache \
     cmake \
+    cppzmq-dev \
     curl \
+    dnsmasq \
     flex \
     g++ \
     gcc \
     git \
     jq \
     libkrb5-dev \
+    libnats-dev \
     libnode-dev \
     libpcap-dev \
+    librdkafka-dev \
     libssl-dev \
     libuv1-dev \
-    libzmq3-dev \
     make \
     python3 \
     python3-dev \
     python3-pip\
+    python3-websockets \
     sqlite3 \
     swig \
     wget \
@@ -35,4 +39,6 @@ RUN apt-get update && apt-get -y install \
   && apt autoclean \
   && rm -rf /var/lib/apt/lists/*
 
-RUN pip3 install websockets junit2html
+# Debian trixie really doesn't like using pip to install system wide stuff, but
+# doesn't seem there's a python3-junit2html package, so not sure what we'd break.
+RUN pip3 install --break-system-packages junit2html

docker/builder.Dockerfile

@@ -1,7 +1,7 @@
 # See the file "COPYING" in the main distribution directory for copyright.
 
 # Layer to build Zeek.
-FROM debian:bookworm-slim
+FROM debian:13-slim
 
 # Make the shell split commands in the log so we can determine reasons for
 # failures more easily.
@@ -16,6 +16,7 @@ RUN echo 'Acquire::https::timeout "180";' >> /etc/apt/apt.conf.d/99-timeouts
 
 # Configure system for build.
 RUN apt-get -q update \
+ && apt-get upgrade -q -y \
  && apt-get install -q -y --no-install-recommends \
      bind9 \
      bison \
@@ -36,7 +37,7 @@ RUN apt-get -q update \
      libz-dev \
      make \
      python3-minimal \
-     python3.11-dev \
+     python3-dev \
      swig \
      ninja-build \
      python3-pip \

docker/final.Dockerfile

@@ -1,7 +1,7 @@
 # See the file "COPYING" in the main distribution directory for copyright.
 
 # Final layer containing all artifacts.
-FROM debian:bookworm-slim
+FROM debian:13-slim
 
 # Make the shell split commands in the log so we can determine reasons for
 # failures more easily.
@@ -15,14 +15,15 @@ RUN echo 'Acquire::http::timeout "180";' > /etc/apt/apt.conf.d/99-timeouts
 RUN echo 'Acquire::https::timeout "180";' >> /etc/apt/apt.conf.d/99-timeouts
 
 RUN apt-get -q update \
+ && apt-get upgrade -q -y \
  && apt-get install -q -y --no-install-recommends \
      ca-certificates \
      git \
      jq \
      libmaxminddb0 \
-     libnode108 \
+     libnode115 \
      libpcap0.8 \
-     libpython3.11 \
+     libpython3.13 \
      libssl3 \
      libuv1 \
      libz1 \