From b551bc9fc3af1f5014830bbaf7dc356f1b403adc Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Mon, 28 Aug 2023 10:25:08 -0700
Subject: [PATCH 1/2] CI: Remove EOL ubuntu 22.10 build

---
 .cirrus.yml                |  7 -------
 ci/ubuntu-22.10/Dockerfile | 41 --------------------------------------
 2 files changed, 48 deletions(-)
 delete mode 100644 ci/ubuntu-22.10/Dockerfile

diff --git a/.cirrus.yml b/.cirrus.yml
index 59499d7a8e..af498ffe1e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -260,13 +260,6 @@ opensuse_tumbleweed_task:
   << : *CI_TEMPLATE
 #  << : *SKIP_TASK_ON_PR
 
-ubuntu2210_task:
-  container:
-    # Ubuntu 22.10 EOL: July 2023
-    dockerfile: ci/ubuntu-22.10/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
-
 ubuntu22_task:
   container:
     # Ubuntu 22.04 EOL: April 2027
diff --git a/ci/ubuntu-22.10/Dockerfile b/ci/ubuntu-22.10/Dockerfile
deleted file mode 100644
index cc999f0d14..0000000000
--- a/ci/ubuntu-22.10/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-FROM ubuntu:22.10
-
-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 20230801
-
-RUN apt-get update && apt-get -y install \
-    bc \
-    bison \
-    bsdmainutils \
-    ccache \
-    cmake \
-    curl \
-    flex \
-    g++ \
-    gcc \
-    git \
-    lcov \
-    libkrb5-dev \
-    libmaxminddb-dev \
-    libnode-dev \
-    libpcap-dev \
-    libssl-dev \
-    libuv1-dev \
-    make \
-    python3 \
-    python3-dev \
-    python3-pip\
-    ruby \
-    sqlite3 \
-    swig \
-    unzip \
-    wget \
-    zlib1g-dev \
-  && apt autoclean \
-  && rm -rf /var/lib/apt/lists/*
-
-RUN pip3 install websockets junit2html
-RUN gem install coveralls-lcov

From ac82d4bcbdfe8bf075e8223d654e91449787c034 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Mon, 28 Aug 2023 14:48:19 -0700
Subject: [PATCH 2/2] CI: Add ubuntu 23.04 build

---
 .cirrus.yml                |  7 +++++++
 ci/ubuntu-23.04/Dockerfile | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 ci/ubuntu-23.04/Dockerfile

diff --git a/.cirrus.yml b/.cirrus.yml
index af498ffe1e..fcee415eb7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -260,6 +260,13 @@ opensuse_tumbleweed_task:
   << : *CI_TEMPLATE
 #  << : *SKIP_TASK_ON_PR
 
+ubuntu23_task:
+  container:
+    # Ubuntu 23.04 EOL: January 2024
+    dockerfile: ci/ubuntu-23.04/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
 ubuntu22_task:
   container:
     # Ubuntu 22.04 EOL: April 2027
diff --git a/ci/ubuntu-23.04/Dockerfile b/ci/ubuntu-23.04/Dockerfile
new file mode 100644
index 0000000000..b468bb9d23
--- /dev/null
+++ b/ci/ubuntu-23.04/Dockerfile
@@ -0,0 +1,38 @@
+FROM ubuntu:23.04
+
+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 20230828
+
+RUN apt-get update && apt-get -y install \
+    bc \
+    bison \
+    bsdmainutils \
+    ccache \
+    cmake \
+    curl \
+    flex \
+    g++ \
+    gcc \
+    git \
+    libkrb5-dev \
+    libmaxminddb-dev \
+    libpcap-dev \
+    libssl-dev \
+    make \
+    python3 \
+    python3-dev \
+    python3-pip \
+    python3-websockets \
+    ruby \
+    sqlite3 \
+    swig \
+    unzip \
+    wget \
+    zlib1g-dev \
+  && apt autoclean \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN pip3 install --break-system-packages junit2html