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/fix-cluster-testing-docker-compose-v2'

Browse source 
* origin/topic/awelzel/fix-cluster-testing-docker-compose-v2:
  testing/external/cluster: Switch to docker-compose v2
This commit is contained in:
Arne Welzel 2024-03-15 13:36:30 +01:00
commit d51613a7b2
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
CHANGES
View file

@ -1,3 +1,14 @@
7.0.0-dev.59 | 2024-03-15 13:36:30 +0100
* testing/external/cluster: Switch to docker-compose v2 (Arne Welzel, Corelight)
The Python docker-compose executable in the docker_builder image is not
functional anymore (TypeError: kwargs_from_env() got an unexpected
keyword argument 'ssl_version').
docker-compose v1 has been sun-setted for quite some time. Do the
minimal to switch to docker compose v2.
7.0.0-dev.57 | 2024-03-13 10:17:48 -0700 7.0.0-dev.57 | 2024-03-13 10:17:48 -0700
* Add community contributions for the 6.2 timeframe to NEWS. [skip ci] (Christian Kreibich, Corelight) * Add community contributions for the 6.2 timeframe to NEWS. [skip ci] (Christian Kreibich, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.0.0-dev.57 7.0.0-dev.59

2
testing/external/commit-hash.zeek-testing-cluster vendored
View file

@ -1 +1 @@
4545b99967c9388d0034791d4c7ffc9bb40db581 216efb97832e412ae0197dc8e36069d8c35fd81c