Merge pull request #2153 from anarkiwi/rel

v0.17.4
faucetsdn · Jan 28, 2021 · 57deb75 · 57deb75
2 parents ad8bd69 + b6bf027
commit 57deb75
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v0.17.4 (2020-01-29)
+
+* fix metadata merge keyerror
+* Updated crviz, urlib3, certstrap, faucetconfrpc, prometheus, networkml, net-tools
+
 # v0.17.3 (2020-01-15)
 
 * Fix networkml no results.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.17.4.dev
+0.17.4
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.7'
 services:
     rabbit:
         restart: always
-        image: 'iqtlabs/rabbitmq:latest'
+        image: 'iqtlabs/rabbitmq:v0.17.4'
         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.19'
@@ -37,7 +34,7 @@ services:
             - poseidon
     poseidon_api:
         restart: always
-        image: 'iqtlabs/poseidon-api:latest'
+        image: 'iqtlabs/poseidon-api:v0.17.4'
         ports:
             - '5000:8000'
         environment:
@@ -50,12 +47,9 @@ services:
                     - poseidon-api
         depends_on:
             - poseidon
-        build:
-            context: helpers/api
-            dockerfile: Dockerfile
     poseidon:
         restart: always
-        image: 'iqtlabs/poseidon:latest'
+        image: 'iqtlabs/poseidon:v0.17.4'
         ports:
             - '9304:9304'
         environment:
@@ -68,12 +62,9 @@ services:
             - poseidon
         depends_on:
             - rabbit
-        build:
-            context: .
-            dockerfile: Dockerfile
     workers:
         restart: always
-        image: 'iqtlabs/poseidon-workers:latest'
+        image: 'iqtlabs/poseidon-workers:v0.17.4'
         environment:
             PYTHONUNBUFFERED: '1'
             KEEPIMAGES: '0'
@@ -85,9 +76,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/workers/workers.json b/workers/workers.json
@@ -11,7 +11,7 @@
         "pcap"
       ],
       "stage": "poseidon_poseidon",
-      "version": "v0.11.18",
+      "version": "v0.11.19",
       "viewableOutput": false
     },
     {
@@ -25,7 +25,7 @@
         "pcap"
       ],
       "stage": "poseidon_poseidon",
-      "version": "v0.11.18",
+      "version": "v0.11.19",
       "viewableOutput": false
     },
     {
@@ -51,7 +51,7 @@
         "rabbitmq"
       ],
       "stage": "poseidon_poseidon",
-      "version": "v0.6.7",
+      "version": "v0.6.8",
       "viewableOutput": true
     },
     {
@@ -74,7 +74,7 @@
         "rabbitmq"
       ],
       "stage": "poseidon_poseidon",
-      "version": "v0.11.18",
+      "version": "v0.11.19",
       "viewableOutput": true
     },
     {