Merge pull request #1739 from cglewis/master

release v0.13.0

CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.13.0 (2020-06-18)
+
+- Removed support for BCF (BigSwitch Cloud Fabric)
+- Better cleanup of services when using docker swarm
+- Faucet tunnels are now used for mirroring, allowing multi-switch mirroring to a single location
+- Updated faucet, gauge, event-adapter-rabbitmq, cmd2, requests, pylint, pytest-cov, buildx
+
 # v0.12.3 (2020-06-05)
 
 - BCF (Bigswitch Cloud Fabric) support is deprecated and will be removed in the next release

README.md

@@ -153,7 +153,7 @@ If you want to Poseidon to spin up Faucet for you as well, simply run:
 poseidon start
 ```
 
-Other if using your own installation of Faucet (note you'll need to wire together the event socket and config reload options yourself if you go this path):
+Otherwise if using your own installation of Faucet (note you'll need to wire together the event socket and config reload options yourself if you go this path):
 ```
 poseidon start --standalone
 ```

VERSION

@@ -1 +1 @@
-0.13.0.dev
+0.13.0

docker-compose.yaml

@@ -2,14 +2,14 @@ version: '3.7'
 services:
     redis:
         restart: always
-        image: 'cyberreboot/redis:latest'
+        image: 'cyberreboot/redis:v0.13.0'
         volumes:
             - '${POSEIDON_PREFIX}/opt/redis:/data'
         networks:
             poseidon:
     rabbit:
         restart: always
-        image: 'cyberreboot/rabbitmq:latest'
+        image: 'cyberreboot/rabbitmq:v0.13.0'
         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.13.0'
         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.13.0'
         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.13.0'
         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

helpers/faucet/docker-compose.yaml

@@ -14,14 +14,6 @@ services:
             FA_RABBIT_ROUTING_KEY: '${FA_RABBIT_ROUTING_KEY}'
         networks:
             - poseidon
-    faucetagent_adapter:
-        restart: "no"
-        image: 'faucet/event-adapter-faucetagent:1.9.46'
-        ports:
-            - '10161:10161'
-        volumes:
-            - '${POSEIDON_PREFIX}/opt/faucetagent/certs:/opt/faucetagent/certs'
-            - '${POSEIDON_PREFIX}/etc/faucet:/etc/faucet'
 networks:
     poseidon:
         driver: overlay

workers/workers.json

@@ -51,7 +51,7 @@
         "rabbitmq"
       ],
       "stage": "poseidon_poseidon",
-      "version": "v0.5.5",
+      "version": "v0.5.6",
       "viewableOutput": true
     },
     {
@@ -90,4 +90,4 @@
       "viewableOutput": false
     }
   ]
-}
+}