Commit graph

20 commits

Author SHA1 Message Date
Tim Wojtulewicz
80085ba018 CI: Add more logging during docker builds
(cherry picked from commit 3d1380305b)
2024-01-18 14:09:51 -08:00
Arne Welzel
7fbc085c40 Merge remote-tracking branch 'matti/topic/matti/docker-jq'
* matti/topic/matti/docker-jq:
  Add jq to final.Dockerfile

(cherry picked from commit 5ef5733fcc)
2024-01-12 11:20:48 -07:00
Arne Welzel
7ef1099d37 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

(cherry picked from commit 84d605602f)
2023-06-15 13:21:17 -07: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