From 692c6a2f10b4ae6e56058e66daf9ce4eb8e95441 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 28 Aug 2025 12:52:01 -0700 Subject: [PATCH] Switch Zeek Spicy builds to Ubuntu 24 --- .cirrus.yml | 12 ++++++------ ci/ubuntu-24.04/Dockerfile | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index a8de9c1259..be1d2e5d97 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -432,10 +432,10 @@ ubuntu22_task: benchmark_script: ./ci/benchmark.sh # Also enable Spicy SSL for this -ubuntu22_spicy_task: +ubuntu24_spicy_task: container: - # Ubuntu 22.04 EOL: April 2027 - dockerfile: ci/ubuntu-22.04/Dockerfile + # Ubuntu 24.04 EOL: Jun 2029 + dockerfile: ci/ubuntu-24.04/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE << : *ONLY_IF_PR_MASTER_RELEASE @@ -448,10 +448,10 @@ ubuntu22_spicy_task: path: build.tgz benchmark_script: ./ci/benchmark.sh -ubuntu22_spicy_head_task: +ubuntu24_spicy_head_task: container: - # Ubuntu 22.04 EOL: April 2027 - dockerfile: ci/ubuntu-22.04/Dockerfile + # Ubuntu 24.04 EOL: Jun 2029 + dockerfile: ci/ubuntu-24.04/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE << : *ONLY_IF_PR_MASTER_RELEASE_NIGHTLY diff --git a/ci/ubuntu-24.04/Dockerfile b/ci/ubuntu-24.04/Dockerfile index 47539ddf65..b4df50fcfb 100644 --- a/ci/ubuntu-24.04/Dockerfile +++ b/ci/ubuntu-24.04/Dockerfile @@ -4,7 +4,7 @@ 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 20250522 +ENV DOCKERFILE_VERSION=20250522 RUN apt-get update && apt-get -y install \ bc \ @@ -32,7 +32,9 @@ RUN apt-get update && apt-get -y install \ make \ python3 \ python3-dev \ + python3-git \ python3-pip \ + python3-semantic-version \ redis-server \ ruby \ sqlite3 \