Merge pull request #1715 from anarkiwi/rel

0.12.3.
faucetsdn · Jun 4, 2020 · 13c4765 · 13c4765
2 parents 45d67aa + 919e6a9
commit 13c4765
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git 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.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.12.3.dev
+0.12.3
diff --git 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
diff --git 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
@@ -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
     },
     {