Merge remote-tracking branch 'origin/topic/awelzel/3115-debian-12'

* origin/topic/awelzel/3115-debian-12:
  NEWS: Add entry about Debian 12
  docker: Add libnode to enable JavaScript support
  docker: Bump images to Debian 12

CHANGES

@@ -1,3 +1,9 @@
+6.1.0-dev.54 | 2023-06-14 18:55:27 +0200
+
+  * docker: Add libnode to enable JavaScript support (Arne Welzel, Corelight)
+
+  * docker: Bump images to Debian 12 (Arne Welzel, Corelight)
+
 6.1.0-dev.50 | 2023-06-14 09:25:58 -0700
 
   * Fix usage of realpath on macOS, instead preferring grealpath (Tim Wojtulewicz, Corelight)

NEWS

@@ -309,6 +309,9 @@ New Functionality
 Changed Functionality
 ---------------------
 
+- The base distribution of the Zeek container images has been upgraded to
+  Debian 12 "bookworm" and JavaScript support was enabled.
+
 - 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.

VERSION

@@ -1 +1 @@
-6.1.0-dev.50
+6.1.0-dev.54

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
 
@@ -18,15 +18,20 @@ RUN apt-get -q update \
      git \
      libfl2 \
      libfl-dev \
+     libnode-dev \
      libmaxminddb-dev \
      libpcap-dev \
      libssl-dev \
+     libuv1-dev \
      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 '*'

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,11 @@ RUN apt-get -q update \
      ca-certificates \
      git \
      libmaxminddb0 \
-     libpython3.9 \
+     libnode108 \
+     libpython3.11 \
      libpcap0.8 \
-     libssl1.1 \
+     libssl3 \
+     libuv1 \
      libz1 \
      python3-minimal \
      python3-git \