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/3143-no-more-zeekurity' into release/6.0

Browse source 
* origin/topic/awelzel/3143-no-more-zeekurity:
  cirrus: Stop pushing container images to zeekurity
This commit is contained in:
Tim Wojtulewicz 2023-06-21 11:46:48 -07:00
commit 6a033d5aed
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.cirrus.yml
View file

@ -407,8 +407,6 @@ windows_task:
# 2 hour timeout just for potential of building Docker image taking a while # 2 hour timeout just for potential of building Docker image taking a while
timeout_in: 120m timeout_in: 120m
windows_container: windows_container:
# image: cirrusci/windowsservercore:cmake
# image: zeekurity/broker-ci-windows:latest
dockerfile: ci/windows/Dockerfile dockerfile: ci/windows/Dockerfile
os_version: 2019 os_version: 2019
cpu: 8 cpu: 8
@ -608,9 +606,6 @@ container_image_manifest_docker_builder:
# Tag images and push to Docker Hub and AWS ECR "zeek" account # Tag images and push to Docker Hub and AWS ECR "zeek" account
- ./ci/container-images-tag-and-push.sh - ./ci/container-images-tag-and-push.sh
- REGISTRY_PREFIX=public.ecr.aws/ ./ci/container-images-tag-and-push.sh - REGISTRY_PREFIX=public.ecr.aws/ ./ci/container-images-tag-and-push.sh
# Continue to push tags to the "zeekurity" account as well.
- ZEEK_IMAGE_REPO=zeekurity ./ci/container-images-tag-and-push.sh
depends_on: depends_on:
- arm64_container_image - arm64_container_image
- amd64_container_image - amd64_container_image

12
CHANGES
View file

@ -1,3 +1,15 @@
6.0.0-rc2.17 | 2023-06-21 11:46:48 -0700
* cirrus: Stop pushing container images to zeekurity (Arne Welzel, Corelight)
Closes #3143
* CI: Force rebuild of tumbleweed VM to pick up newer version of python (Tim Wojtulewicz, Corelight)
The version of python included in the existing VM doesn't have the sqlite
module included for some reason. Forcing the VM to rebuild installs python311
which does include it, fixing a build failure.
6.0.0-rc2.12 | 2023-06-15 15:20:20 -0700 6.0.0-rc2.12 | 2023-06-15 15:20:20 -0700
* GH-3112: cluster/logger: Fix leftover-log-rotation in multi-logger setups (Arne Welzel, Corelight) * GH-3112: cluster/logger: Fix leftover-log-rotation in multi-logger setups (Arne Welzel, Corelight)

4
NEWS
View file

@ -57,6 +57,10 @@ Breaking Changes
depending on the functionality included in the plugin, may trigger subsequent depending on the functionality included in the plugin, may trigger subsequent
errors during configuration or build. errors during configuration or build.
- Zeek container images are not pushed to the zeekurity organization anymore.
Please switch to using the ``zeek/zeek`` image on DockerHub, or the images
published to ``public.ecr.aws/zeek/zeek``.
- The IRC_Data analyzer declaration has been moved to protocols/irc/IRC.h. - The IRC_Data analyzer declaration has been moved to protocols/irc/IRC.h.
- The error message returned when using ``bro_init``, ``bro_done``, and - The error message returned when using ``bro_init``, ``bro_done``, and

2
VERSION
View file

@ -1 +1 @@
6.0.0-rc2.12 6.0.0-rc2.17