Merge pull request #2647 from cglewis/main

bump back to dev

Author: cglewis

Diff for: docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3.7'
 services:
     rabbit:
         restart: always
-        image: 'iqtlabs/rabbitmq:v0.18.0'
+        image: 'iqtlabs/rabbitmq:latest'
         ports:
             - '127.0.0.1:15672:15672'
             - '5672:5672'
@@ -12,6 +12,9 @@ services:
                     - RABBIT_SERVER
                     - rabbitmq
                     - messenger
+        build:
+            context: helpers/rabbitmq
+            dockerfile: Dockerfile
     network_tap:
         restart: always
         image: 'iqtlabs/network_tap:v0.11.33'
@@ -25,7 +28,7 @@ services:
             poseidon:
     poseidon_api:
         restart: always
-        image: 'iqtlabs/poseidon-api:v0.18.0'
+        image: 'iqtlabs/poseidon-api:latest'
         ports:
             - '5000:8000'
         environment:
@@ -38,9 +41,12 @@ services:
                     - poseidon-api
         depends_on:
             - poseidon
+        build:
+            context: helpers/api
+            dockerfile: Dockerfile
     poseidon:
         restart: always
-        image: 'iqtlabs/poseidon:v0.18.0'
+        image: 'iqtlabs/poseidon:latest'
         ports:
             - '9304:9304'
         environment:
@@ -56,9 +62,12 @@ services:
                 condition: service_healthy
             rabbitmq_adapter:
                 condition: service_started
+        build:
+            context: .
+            dockerfile: Dockerfile
     workers:
         restart: always
-        image: 'iqtlabs/poseidon-workers:v0.18.0'
+        image: 'iqtlabs/poseidon-workers:latest'
         environment:
             PYTHONUNBUFFERED: '1'
             KEEPIMAGES: '0'
@@ -70,6 +79,9 @@ services:
             - '/var/run/docker.sock:/var/run/docker.sock'
         depends_on:
             - poseidon
+        build:
+            context: workers
+            dockerfile: Dockerfile
 networks:
     poseidon:
         driver: overlay

Diff for: lib/poseidon_api/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poseidon-api"
-version = "0.18.0"
+version = "0.18.1.dev"
 description = "RESTful API for querying Poseidon"
 authors = ["cglewis <[email protected]>"]
 license = "Apache-2.0"

Diff for: lib/poseidon_cli/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poseidon-cli"
-version = "0.18.0"
+version = "0.18.1.dev"
 description = "Commandline tool for querying Poseidon via Prometheus"
 authors = ["cglewis <[email protected]>"]
 license = "Apache-2.0"

Diff for: lib/poseidon_core/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poseidon-core"
-version = "0.18.0"
+version = "0.18.1.dev"
 description = "Poseidon core package, an application that leverages software defined networks (SDN) to acquire and then feed network traffic to a number of analytic tools."
 authors = ["cglewis <[email protected]>"]
 license = "Apache-2.0"