Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
* 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
This commit is contained in:
Arne Welzel 2023-06-14 18:55:27 +02:00
commit 84d605602f
5 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -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 6.1.0-dev.50 | 2023-06-14 09:25:58 -0700
* Fix usage of realpath on macOS, instead preferring grealpath (Tim Wojtulewicz, Corelight) * Fix usage of realpath on macOS, instead preferring grealpath (Tim Wojtulewicz, Corelight)

3
NEWS
View file

@ -309,6 +309,9 @@ New Functionality
Changed 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 - 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 an appropriate callback function, log a warning and return a generic handle
value based on the analyzer and connection information. value based on the analyzer and connection information.

2
VERSION
View file

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

9
docker/builder.Dockerfile
View file

@ -1,7 +1,7 @@
# See the file "COPYING" in the main distribution directory for copyright. # See the file "COPYING" in the main distribution directory for copyright.
# Layer to build Zeek. # Layer to build Zeek.
FROM debian:bullseye-slim FROM debian:bookworm-slim
RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries
@ -18,15 +18,20 @@ RUN apt-get -q update \
git \ git \
libfl2 \ libfl2 \
libfl-dev \ libfl-dev \
libnode-dev \
libmaxminddb-dev \ libmaxminddb-dev \
libpcap-dev \ libpcap-dev \
libssl-dev \ libssl-dev \
libuv1-dev \
libz-dev \ libz-dev \
make \ make \
python3-minimal \ python3-minimal \
python3.9-dev \ python3.11-dev \
swig \ swig \
ninja-build \ ninja-build \
python3-pip \ python3-pip \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Tell git all the repositories are safe.
RUN git config --global --add safe.directory '*'

8
docker/final.Dockerfile
View file

@ -1,7 +1,7 @@
# See the file "COPYING" in the main distribution directory for copyright. # See the file "COPYING" in the main distribution directory for copyright.
# Final layer containing all artifacts. # 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 RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries
@ -10,9 +10,11 @@ RUN apt-get -q update \
ca-certificates \ ca-certificates \
git \ git \
libmaxminddb0 \ libmaxminddb0 \
libpython3.9 \ libnode108 \
libpython3.11 \
libpcap0.8 \ libpcap0.8 \
libssl1.1 \ libssl3 \
libuv1 \
libz1 \ libz1 \
python3-minimal \ python3-minimal \
python3-git \ python3-git \