From 076c0d58252e591372675cd09ed27c6217d17950 Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Thu, 4 Jun 2020 18:28:12 +1200 Subject: [PATCH 1/3] 0.12.3. --- VERSION | 2 +- docker-compose.yaml | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/VERSION b/VERSION index aac849b0a..aa22d3ce3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.12.3.dev +0.12.3 diff --git a/docker-compose.yaml b/docker-compose.yaml index 6b6a78fc2..544cd5d11 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,14 +2,14 @@ version: '3.7' services: redis: restart: always - image: 'cyberreboot/redis:latest' + image: 'cyberreboot/redis:v0.12.3' volumes: - '${POSEIDON_PREFIX}/opt/redis:/data' networks: poseidon: rabbit: restart: always - image: 'cyberreboot/rabbitmq:latest' + image: 'cyberreboot/rabbitmq:v0.12.3' ports: - '127.0.0.1:15672:15672' - '5672:5672' @@ -41,7 +41,7 @@ services: - poseidon poseidon_api: restart: always - image: 'cyberreboot/poseidon-api:latest' + image: 'cyberreboot/poseidon-api:v0.12.3' ports: - '5000:8000' environment: @@ -52,12 +52,9 @@ services: - poseidon-api depends_on: - poseidon - build: - context: api - dockerfile: Dockerfile poseidon: restart: always - image: 'cyberreboot/poseidon:latest' + image: 'cyberreboot/poseidon:v0.12.3' environment: PYTHONUNBUFFERED: '1' volumes: @@ -70,12 +67,9 @@ services: depends_on: - rabbit - redis - build: - context: . - dockerfile: Dockerfile workers: restart: always - image: 'cyberreboot/poseidon-workers:latest' + image: 'cyberreboot/poseidon-workers:v0.12.3' environment: PYTHONUNBUFFERED: '1' KEEPIMAGES: '0' @@ -87,9 +81,6 @@ services: - '/var/run/docker.sock:/var/run/docker.sock' depends_on: - poseidon - build: - context: workers - dockerfile: Dockerfile networks: poseidon: driver: overlay From dc84be8f188dc7b2eacf63da47d6c263499221f4 Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Thu, 4 Jun 2020 18:31:41 +1200 Subject: [PATCH 2/3] Changelog. --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e708a1dbf..26289206d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v0.12.3 (2020-06-05) + +- BCF (Bigswitch Cloud Fabric) support is deprecated and will be removed in the next release +- Experimental support for docker swarms +- When FAUCET stacking is detected, do not redundantly learn endpoints on stack links +- Update faucet, gauge, event-adapter-rabbit-mq, buildx, pytype, docker, redis, grafana, pytest + + # v0.12.2 (2020-05-21) - Fix API not updated with networkml/p0f results. From 919e6a9593cf8c1fd08edb0cda25855022452863 Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Thu, 4 Jun 2020 18:53:42 +1200 Subject: [PATCH 3/3] Fix update_workers_json for latest github API. --- release/update_workers_json.py | 8 ++++---- workers/workers.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/release/update_workers_json.py b/release/update_workers_json.py index bd1437f5b..e0ae4708f 100755 --- a/release/update_workers_json.py +++ b/release/update_workers_json.py @@ -30,10 +30,10 @@ print('no release for %s, skipping update' % worker['image']) continue latest_json = json.loads(res.read().decode('utf-8')) - latest_name = latest_json['name'] - if latest_name != latest_json['name']: - changes.add((repo, latest_json['name'])) - worker['version'] = latest_name + latest_version = latest_json['name'] + if worker['version'] != latest_version: + changes.add((repo, latest_version)) + worker['version'] = latest_version with open(WORKERS_JSON, 'w') as f: f.write(json.dumps(workers, indent=2, sort_keys=True)) diff --git a/workers/workers.json b/workers/workers.json index d52281d29..0dfe63567 100644 --- a/workers/workers.json +++ b/workers/workers.json @@ -11,7 +11,7 @@ "pcap" ], "stage": "poseidon_poseidon", - "version": "v0.11.9", + "version": "v0.11.10", "viewableOutput": false }, { @@ -25,7 +25,7 @@ "pcap" ], "stage": "poseidon_poseidon", - "version": "v0.11.9", + "version": "v0.11.10", "viewableOutput": false }, { @@ -51,7 +51,7 @@ "rabbitmq" ], "stage": "poseidon_poseidon", - "version": "v0.5.4", + "version": "v0.5.5", "viewableOutput": true }, { @@ -73,7 +73,7 @@ "rabbitmq" ], "stage": "poseidon_poseidon", - "version": "v0.11.9", + "version": "v0.11.10", "viewableOutput": true }, {