From 91afdd03b8c817816c71270b95110a1011818ed0 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 13 Aug 2025 14:56:26 +0200 Subject: [PATCH 1/5] docker: Bump to debian:trixie-slim --- docker/builder.Dockerfile | 5 +++-- docker/final.Dockerfile | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docker/builder.Dockerfile b/docker/builder.Dockerfile index 72ca2f3eb3..078c6ef7d6 100644 --- a/docker/builder.Dockerfile +++ b/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 \ diff --git a/docker/final.Dockerfile b/docker/final.Dockerfile index 8cfb7b1942..395854e099 100644 --- a/docker/final.Dockerfile +++ b/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 \ From ccd4a2935cd6910ae8a6d3e0417d512cb6ea79fe Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 13 Aug 2025 15:03:35 +0200 Subject: [PATCH 2/5] ci: Add Debian 13.0 (trixie) --- .cirrus.yml | 30 +++++++++++++------------- ci/{debian-11 => debian-13}/Dockerfile | 14 ++++++++---- 2 files changed, 25 insertions(+), 19 deletions(-) rename ci/{debian-11 => debian-13}/Dockerfile (64%) diff --git a/.cirrus.yml b/.cirrus.yml index 837675fd0b..d3c5a03e29 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -208,51 +208,51 @@ centosstream9_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE -debian12_task: +debian13_task: container: - # Debian 12 (bookworm) EOL: TBD - dockerfile: ci/debian-12/Dockerfile + # Debian 13 (trixie) EOL: TBD + dockerfile: ci/debian-13/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE -arm_debian12_task: +arm_debian13_task: arm_container: - # Debian 12 (bookworm) EOL: TBD - dockerfile: ci/debian-12/Dockerfile + # Debian 13 (trixie) EOL: TBD + 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 - dockerfile: ci/debian-12/Dockerfile + # Debian 13 (trixie) EOL: TBD + 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 - dockerfile: ci/debian-12/Dockerfile + # Debian 13 (trixie) EOL: TBD + 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 - dockerfile: ci/debian-11/Dockerfile + # Debian 12 (bookworm) EOL: TBD + dockerfile: ci/debian-12/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE << : *SKIP_TASK_ON_PR diff --git a/ci/debian-11/Dockerfile b/ci/debian-13/Dockerfile similarity index 64% rename from ci/debian-11/Dockerfile rename to ci/debian-13/Dockerfile index a4a5442b65..a9bc9e8eea 100644 --- a/ci/debian-11/Dockerfile +++ b/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 From 3e4c2c0288eb2ec900fa10b61b76acf498df3306 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 13 Aug 2025 15:06:56 +0200 Subject: [PATCH 3/5] ci: Enable Spicy for arm_debian13 --- .cirrus.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d3c5a03e29..fcdc94040b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -221,8 +221,6 @@ arm_debian13_task: dockerfile: ci/debian-13/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE - env: - ZEEK_CI_CONFIGURE_FLAGS: *NO_SPICY_CONFIG debian13_static_task: container: From 80ecaf491cd4ec153023c91c874f183058918f3d Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 13 Aug 2025 16:10:12 +0200 Subject: [PATCH 4/5] ci: Prepend timestamps to output --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index fcdc94040b..838f267c02 100644 --- a/.cirrus.yml +++ b/.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 From b34641885614cc165b97838b7023aac213cb372c Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 13 Aug 2025 20:38:14 +0200 Subject: [PATCH 5/5] ci: Run zeekctl and builtin tasks with Debian 13, too --- .cirrus.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 838f267c02..818291afa3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -796,8 +796,8 @@ zeekctl_debian12_task: $CIRRUS_BRANCH =~ 'release/.*' ) ) container: - # Debian 12 (bookworm) EOL: TBD - dockerfile: ci/debian-12/Dockerfile + # Debian 13 (trixie) EOL: TBD + dockerfile: ci/debian-13/Dockerfile << : *RESOURCES_TEMPLATE sync_submodules_script: git submodule update --recursive --init always: @@ -820,8 +820,8 @@ include_plugins_debian12_task: cpu: *CPUS memory: *MEMORY container: - # Debian 12 (bookworm) EOL: TBD - dockerfile: ci/debian-12/Dockerfile + # Debian 13 (trixie) EOL: TBD + dockerfile: ci/debian-13/Dockerfile << : *RESOURCES_TEMPLATE sync_submodules_script: git submodule update --recursive --init fetch_external_plugins_script: