Merge pull request #1966 from anarkiwi/rel

Release 0.15.6.
faucetsdn · Oct 22, 2020 · 21168ca · 21168ca
2 parents a0dd6da + a2d5e39
commit 21168ca
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v0.15.6 (2020-10-23)
+
+* Speed up DNS resolution (parallel)
+* Poseidon can use its own grpc client key
+* Upgrade network-tools, networkml, pytype, transitions, prometheus, urllib3, faucet, faucetconfrpc, grafana
+
 # v0.15.5 (2020-10-09)
 
 * Add e2e test, reduce size of poseidon and poseidon-api containers.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.15.6.dev
+0.15.6
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -2,14 +2,14 @@ version: '3.7'
 services:
     redis:
         restart: always
-        image: 'iqtlabs/redis:latest'
+        image: 'iqtlabs/redis:v0.15.6'
         volumes:
             - '${POSEIDON_PREFIX}/opt/redis:/data'
         networks:
             poseidon:
     rabbit:
         restart: always
-        image: 'iqtlabs/rabbitmq:latest'
+        image: 'iqtlabs/rabbitmq:v0.15.6'
         ports:
             - '127.0.0.1:15672:15672'
             - '5672:5672'
@@ -41,7 +41,7 @@ services:
             - poseidon
     poseidon_api:
         restart: always
-        image: 'iqtlabs/poseidon-api:latest'
+        image: 'iqtlabs/poseidon-api:v0.15.6'
         ports:
             - '5000:8000'
         environment:
@@ -52,12 +52,9 @@ services:
                     - poseidon-api
         depends_on:
             - poseidon
-        build:
-            context: api
-            dockerfile: Dockerfile
     poseidon:
         restart: always
-        image: 'iqtlabs/poseidon:latest'
+        image: 'iqtlabs/poseidon:v0.15.6'
         environment:
             PYTHONUNBUFFERED: '1'
         volumes:
@@ -69,12 +66,9 @@ services:
         depends_on:
             - rabbit
             - redis
-        build:
-            context: .
-            dockerfile: Dockerfile
     workers:
         restart: always
-        image: 'iqtlabs/poseidon-workers:latest'
+        image: 'iqtlabs/poseidon-workers:v0.15.6'
         environment:
             PYTHONUNBUFFERED: '1'
             KEEPIMAGES: '0'
@@ -86,9 +80,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/poseidon/helpers/config.py b/poseidon/helpers/config.py
@@ -34,7 +34,8 @@ def get_config(self):
             'reinvestigation_frequency': 900,
             'max_concurrent_reinvestigations': 2,
             'logger_level': 'INFO',
-            'faucetconfrpc_address': 'faucetconfrpc:59999'
+            'faucetconfrpc_address': 'faucetconfrpc:59999',
+            'faucetconfrpc_client': 'faucetconfrpc',
         }
 
         config_map = {

diff --git a/workers/workers.json b/workers/workers.json
@@ -11,7 +11,7 @@
         "pcap"
       ],
       "stage": "poseidon_poseidon",
-      "version": "v0.11.16",
+      "version": "v0.11.17",
       "viewableOutput": false
     },
     {
@@ -25,7 +25,7 @@
         "pcap"
       ],
       "stage": "poseidon_poseidon",
-      "version": "v0.11.16",
+      "version": "v0.11.17",
       "viewableOutput": false
     },
     {
@@ -51,7 +51,7 @@
         "rabbitmq"
       ],
       "stage": "poseidon_poseidon",
-      "version": "v0.6.1",
+      "version": "v0.6.2",
       "viewableOutput": true
     },
     {
@@ -73,7 +73,7 @@
         "rabbitmq"
       ],
       "stage": "poseidon_poseidon",
-      "version": "v0.11.16",
+      "version": "v0.11.17",
       "viewableOutput": true
     },
     {