Merge pull request #2649 from cglewis/main

release v0.18.1

Author: cglewis

Diff for: .github/workflows/docker-extras.yml

@@ -41,11 +41,11 @@ jobs:
         DOCKER_CLI_EXPERIMENTAL: enabled
       run: |
         docker buildx build \
-          --platform linux/amd64,linux/arm/v7,linux/arm64 \
+          --platform linux/amd64,linux/arm64 \
           --push \
           -t iqtlabs/rabbitmq:${{ steps.change_version.outputs.VERSION }} helpers/rabbitmq && \
         docker buildx build \
-          --platform linux/amd64,linux/arm/v7,linux/arm64 \
+          --platform linux/amd64,linux/arm64 \
           --push \
           -t iqtlabs/poseidon-api:${{ steps.change_version.outputs.VERSION }} helpers/api
       if: github.repository == 'iqtlabs/poseidon' && github.event_name == 'push'

Diff for: .github/workflows/docker.yml

@@ -41,11 +41,11 @@ jobs:
         DOCKER_CLI_EXPERIMENTAL: enabled
       run: |
         docker buildx build \
-          --platform linux/amd64,linux/arm/v7,linux/arm64 \
+          --platform linux/amd64,linux/arm64 \
           --push \
           -t iqtlabs/poseidon:${{ steps.change_version.outputs.VERSION }} . && \
         docker buildx build \
-          --platform linux/amd64,linux/arm/v7,linux/arm64 \
+          --platform linux/amd64,linux/arm64 \
           --push \
           -t iqtlabs/poseidon-workers:${{ steps.change_version.outputs.VERSION }} workers
       if: github.repository == 'iqtlabs/poseidon' && github.event_name == 'push'

Diff for: CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.18.1
+
+* Remove build for arm v7 due to ninja not being able to compile anymore
+
 # v0.18.0
 
 * Moved to poetry for package management and dependencies

Diff for: docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3.7'
 services:
     rabbit:
         restart: always
-        image: 'iqtlabs/rabbitmq:latest'
+        image: 'iqtlabs/rabbitmq:v0.18.1'
         ports:
             - '127.0.0.1:15672:15672'
             - '5672:5672'
@@ -12,9 +12,6 @@ services:
                     - RABBIT_SERVER
                     - rabbitmq
                     - messenger
-        build:
-            context: helpers/rabbitmq
-            dockerfile: Dockerfile
     network_tap:
         restart: always
         image: 'iqtlabs/network_tap:v0.11.33'
@@ -28,7 +25,7 @@ services:
             poseidon:
     poseidon_api:
         restart: always
-        image: 'iqtlabs/poseidon-api:latest'
+        image: 'iqtlabs/poseidon-api:v0.18.1'
         ports:
             - '5000:8000'
         environment:
@@ -41,12 +38,9 @@ services:
                     - poseidon-api
         depends_on:
             - poseidon
-        build:
-            context: helpers/api
-            dockerfile: Dockerfile
     poseidon:
         restart: always
-        image: 'iqtlabs/poseidon:latest'
+        image: 'iqtlabs/poseidon:v0.18.1'
         ports:
             - '9304:9304'
         environment:
@@ -62,12 +56,9 @@ services:
                 condition: service_healthy
             rabbitmq_adapter:
                 condition: service_started
-        build:
-            context: .
-            dockerfile: Dockerfile
     workers:
         restart: always
-        image: 'iqtlabs/poseidon-workers:latest'
+        image: 'iqtlabs/poseidon-workers:v0.18.1'
         environment:
             PYTHONUNBUFFERED: '1'
             KEEPIMAGES: '0'
@@ -79,9 +70,6 @@ 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/poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poseidon-api"
-version = "0.18.1.dev"
+version = "0.18.1"
 description = "RESTful API for querying Poseidon"
 authors = ["cglewis <[email protected]>"]
 license = "Apache-2.0"
@@ -15,7 +15,7 @@ falcon = "3.1.0"
 falcon-cors = "1.1.7"
 httpx = "0.23.0"
 natural = "0.2.0"
-poseidon-core = "0.17.21"
+poseidon-core = "0.18.0"
 
 [tool.poetry.dev-dependencies]
 black = "22.6.0"

Diff for: lib/poseidon_api/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poseidon-cli"
-version = "0.18.1.dev"
+version = "0.18.1"
 description = "Commandline tool for querying Poseidon via Prometheus"
 authors = ["cglewis <[email protected]>"]
 license = "Apache-2.0"
@@ -12,7 +12,7 @@ packages = [
 python = ">=3.8 <3.11"
 cmd2 = "2.4.2"
 natural = "0.2.0"
-poseidon-core = "0.17.21"
+poseidon-core = "0.18.0"
 texttable = "1.6.4"
 
 [tool.poetry.dev-dependencies]

Diff for: lib/poseidon_cli/poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poseidon-core"
-version = "0.18.1.dev"
+version = "0.18.1"
 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"