Merge remote-tracking branch 'origin/topic/awelzel/continue-to-push-container-images-to-zeekurity'

* origin/topic/awelzel/continue-to-push-container-images-to-zeekurity:
  cirrus: Also push images to the zeekurity account
This commit is contained in:
Arne Welzel 2023-02-02 11:25:38 +01:00
commit c834ba96ca
3 changed files with 14 additions and 2 deletions

View file

@ -518,9 +518,15 @@ container_image_manifest_docker_builder:
- zstd -d < /tmp/zeek-image-cache-arm64/final.zst | docker load
- zstd -d < /tmp/zeek-image-cache-amd64/final.zst | docker load
tag_push_script:
# Tag images and push to Docker Hub and AWS ECR
# Tag images and push to Docker Hub and AWS ECR "zeek" account
- ./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.
- docker tag zeek/zeek-multiarch:arm64 zeekurity/zeek-multiarch:arm64
- docker tag zeek/zeek-multiarch:amd64 zeekurity/zeek-multiarch:amd64
- ZEEK_IMAGE_REPO=zeekurity ./ci/container-images-tag-and-push.sh
- ZEEK_IMAGE_REPO=zeekurity REGISTRY_PREFIX=public.ecr.aws/ ./ci/container-images-tag-and-push.sh
depends_on:
- arm64_container_image
- amd64_container_image

View file

@ -1,3 +1,9 @@
5.2.0-dev.619 | 2023-02-02 11:25:38 +0100
* cirrus: Also push images to the zeekurity account (Arne Welzel, Corelight)
This was mistakenly removed during f9b0681c98de3dd68f05bd1a8f36fcf8a6ca9068.
5.2.0-dev.617 | 2023-02-01 16:38:41 -0800
* Bump cluster testsuite to pull in fix for test baseline race condition (Christian Kreibich, Corelight)

View file

@ -1 +1 @@
5.2.0-dev.617
5.2.0-dev.619