From 2fb26c2f15e27b97d88211857aeb7d6338f5a69c Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Tue, 13 Jun 2023 15:32:23 +0200
Subject: [PATCH 1/3] docker: Bump images to Debian 12

---
 docker/builder.Dockerfile | 7 +++++--
 docker/final.Dockerfile   | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docker/builder.Dockerfile b/docker/builder.Dockerfile
index 5352c48938..b0a4c8f332 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:bullseye-slim
+FROM debian:bookworm-slim
 
 RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries
 
@@ -24,9 +24,12 @@ RUN apt-get -q update \
      libz-dev \
      make \
      python3-minimal \
-     python3.9-dev \
+     python3.11-dev \
      swig \
      ninja-build \
      python3-pip \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
+
+# Tell git all the repositories are safe.
+RUN git config --global --add safe.directory '*'
diff --git a/docker/final.Dockerfile b/docker/final.Dockerfile
index ca2db566cb..110a9c8b74 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:bullseye-slim
+FROM debian:bookworm-slim
 
 RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries
 
@@ -10,9 +10,9 @@ RUN apt-get -q update \
      ca-certificates \
      git \
      libmaxminddb0 \
-     libpython3.9 \
+     libpython3.11 \
      libpcap0.8 \
-     libssl1.1 \
+     libssl3 \
      libz1 \
      python3-minimal \
      python3-git \

From e99db077bba9b9e73e0cab1b86669d174a1e1d72 Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Tue, 13 Jun 2023 16:55:08 +0200
Subject: [PATCH 2/3] docker: Add libnode to enable JavaScript support

---
 docker/builder.Dockerfile | 2 ++
 docker/final.Dockerfile   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docker/builder.Dockerfile b/docker/builder.Dockerfile
index b0a4c8f332..0c1685ac2e 100644
--- a/docker/builder.Dockerfile
+++ b/docker/builder.Dockerfile
@@ -18,9 +18,11 @@ RUN apt-get -q update \
      git \
      libfl2 \
      libfl-dev \
+     libnode-dev \
      libmaxminddb-dev \
      libpcap-dev \
      libssl-dev \
+     libuv1-dev \
      libz-dev \
      make \
      python3-minimal \
diff --git a/docker/final.Dockerfile b/docker/final.Dockerfile
index 110a9c8b74..e13931f93b 100644
--- a/docker/final.Dockerfile
+++ b/docker/final.Dockerfile
@@ -10,9 +10,11 @@ RUN apt-get -q update \
      ca-certificates \
      git \
      libmaxminddb0 \
+     libnode108 \
      libpython3.11 \
      libpcap0.8 \
      libssl3 \
+     libuv1 \
      libz1 \
      python3-minimal \
      python3-git \

From f83e96d1a642e38f9a5589285bf5462588672960 Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Tue, 13 Jun 2023 18:11:51 +0200
Subject: [PATCH 3/3] NEWS: Add entry about Debian 12

---
 NEWS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index b6ca019137..8f8cdef66a 100644
--- a/NEWS
+++ b/NEWS
@@ -290,6 +290,9 @@ New Functionality
 Changed Functionality
 ---------------------
 
+- The base distribution of the Zeek container images has been upgraded to
+  Debian 12 "bookworm".
+
 - When ``get_file_handle()`` is invoked for an analyzer that did not register
   an appropriate callback function, log a warning and return a generic handle
   value based on the analyzer and connection information.