From 356685d82deea868f4340169b9a6c8d2e2109bed Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Fri, 6 Jun 2025 10:26:17 +0200
Subject: [PATCH] Merge branch 'topic/ado/final-docker' of
 https://github.com/edoardomich/zeek

* 'topic/ado/final-docker' of https://github.com/edoardomich/zeek:
  docker: Add `net-tools` and `procps` dependencies

(cherry picked from commit 8189716adcd16e017c4ea7bcd2358f89bd6cbcc5)
---
 CHANGES                 | 11 +++++++++++
 VERSION                 |  2 +-
 docker/final.Dockerfile |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 5ef8624adb..fd45c20857 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+7.0.8-3 | 2025-07-14 14:11:30 -0700
+
+  * docker: Add `net-tools` and `procps` dependencies (Edoardo Mich)
+
+    Add `net-tools` and `procps` to the final.Dockerfile, to avoid warning in
+    zeekctl commands like: "failed to find local IP addresses [...]" and the
+    error in `zeekctl top` command caused respectively by missing `ifconfig`
+    and `top` commands.
+
+    (cherry picked from commit 8189716adcd16e017c4ea7bcd2358f89bd6cbcc5)
+
 7.0.8-2 | 2025-07-14 14:09:51 -0700
 
   * Update ZeekJS to v0.18.0 (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index 8c5d5f379c..c3776bdd0e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.0.8-2
+7.0.8-3
diff --git a/docker/final.Dockerfile b/docker/final.Dockerfile
index 61c732a2ee..f670823f63 100644
--- a/docker/final.Dockerfile
+++ b/docker/final.Dockerfile
@@ -26,6 +26,9 @@ RUN apt-get -q update \
      libssl3 \
      libuv1 \
      libz1 \
+     libzmq5 \
+     net-tools \
+     procps \
      python3-minimal \
      python3-git \
      python3-semantic-version \