Commit graph

26 commits

Author SHA1 Message Date
Tim Wojtulewicz
db5ab72d0e Remove libzmq5 from Docker images
This was accidentally added in 356685d82d and
doesn't need to be in our official 7.0 images.
2025-07-14 14:28:09 -07:00
Arne Welzel
356685d82d 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 8189716adc)
2025-07-14 14:11:49 -07:00
Peter Cullen
cf09f137bd Update build script
Add back a couple changes that got lost during cleanup.
2024-04-17 14:16:55 -07:00
Peter Cullen
d57679e3dd Support for configurable localversion
Adds a new --localversion option to configure.
The value of localversion becomes part of the Zeek version string.
Docker builds allow an environment variable (LOCALVERSION) to set
the localversion string.
2024-04-17 14:16:47 -07:00
Matti Bispham
5d7cc06e3a Add jq to final.Dockerfile 2023-11-21 22:23:37 +09:00
Tim Wojtulewicz
3d1380305b CI: Add more logging during docker builds 2023-10-12 15:00:52 -07:00
Tim Wojtulewicz
2d8e7368ae CI: Add timeouts for apt commands in docker builder Dockerfiles 2023-10-11 12:56:30 -07:00
Arne Welzel
e99db077bb docker: Add libnode to enable JavaScript support 2023-06-13 20:11:38 +02:00
Arne Welzel
2fb26c2f15 docker: Bump images to Debian 12 2023-06-13 20:11:34 +02:00
Tim Wojtulewicz
62049f5e89 Configure apt to retry a few times on Docker image builder tasks 2023-02-27 14:29:56 -07:00
Arne Welzel
e6f6b1343c docker: Add git to builder 2023-02-13 12:23:36 +01:00
Arne Welzel
2ceaf271f2 docker/Makefile: Remove stray quotes, unused DOCKER 2023-02-13 12:09:59 +01:00
Arne Welzel
13b0e7a2aa docker: Extend tests to run a very basic Zeek script
Mostly because a `-v` shortcuts quite, while a zeek -e 'print zeek_version()'
will also parse all base scripts, etc.
2023-02-01 20:54:09 +01:00
Arne Welzel
4523f678d2 docker: Update Makefile/README to align with the Cirrus CI setup 2023-02-01 20:54:05 +01:00
Arne Welzel
7651c46314 cirrus: Use ccache for faster container builds 2023-02-01 08:52:05 +01:00
Christian Kreibich
108da36b82 Add new zeek-client dependency to Dockerfile: python3-websocket
This is a required dependency of zeek-client, and available as a .deb on Debian.
2022-10-24 15:59:26 -07:00
Benjamin Bannier
95aff9a1e3 Include spicy in build. 2022-05-16 09:07:11 +02:00
Christian Kreibich
8ba6016598 Suppress progress dots in zkg's output in Docker package-install check
These introduced unpredictability in the output, occasionally breaking the
test.
2022-04-21 12:48:32 -07:00
Christian Kreibich
1dd6c1d716 Clean up fully after successful Docker btests
If we leave files sitting around, we trigger a Docker image double-build in CI,
because the build runs once, gets tested, and then gets run again when we push
the Docker image: the additional btest files cause Docker to detect a different
source tree, causing an image layer violation.

Also rename "cleanup" target to "clean", to align with rest of our tree.
2021-11-16 15:13:10 -08:00
Christian Kreibich
946e4f8a42 Enable customization of the Docker image's configure invocation 2021-09-30 08:41:21 -07:00
Christian Kreibich
ee58cb5785 Add Python Broker module load test to Docker image btests
We missed the fact that the broker module didn't load due to a wrong libpython
version because we didn't test that load.

Also remove an unused environment variable from btest.cfg.
2021-09-30 08:41:21 -07:00
Christian Kreibich
25f86d1d7f Set PYTHONPATH in Docker to automatically find Zeek's modules 2021-09-30 08:41:21 -07:00
Christian Kreibich
eaa39a489f Docker image fix: libpython needs to be 3.9 on Debian Bullseye 2021-09-30 08:41:20 -07:00
Benjamin Bannier
2db1ebb2a2 Switch published container image to debian:bullseye-slim 2021-09-24 11:48:49 +02:00
Christian Kreibich
d6c80f6d2c Test container with BTest instead of container-structure-tests
This patch replaces the container-strucuture-tests for the Zeek
container with a BTest-driven approach to provide a more familiar
experience. In addtion to `python3` for `btest` we also rely on `make`
being available in Github-hosted runners which at least currently seems
to be hold (probably pulled in as a dependency of CMake which is
officially included, see
https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md).
2021-09-24 11:48:49 +02:00
Benjamin Bannier
ddae1398f1 Add a minimal containerized environment
This patch adds a minimal Zeek environment packaged as a container.
Since this is intended both as a base layer for other images and as a
quick way to explore Zeek we install only zeek and zkg as basic
functionality.

Closes #1625.
2021-09-24 11:48:19 +02:00