Merge pull request #2407 from anarkiwi/rel

'17.
faucetsdn · Nov 10, 2021 · 2296629 · 2296629
2 parents 5adaea5 + b8225b5
commit 2296629
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v0.17.17 (2021-11-11)
+
+* Use health checks for faucetconfrpc, better handle faucetconfrpc not being available yet at startup (req. min docker-compose 1.29.2).
+* Workaround typed_ast.
+* Upgrade c65sdn, network-tools, prometheus.
+
 # v0.17.16 (2021-11-05)
 
 * Upgrade c65sdn, prometheus, faucetconfrpc, docker, networkml, pylint, pytype, httpx, grafana, pbr

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.17.17.dev
+0.17.17
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.17'
         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.30'
@@ -28,7 +25,7 @@ services:
             poseidon:
     poseidon_api:
         restart: always
-        image: 'iqtlabs/poseidon-api:latest'
+        image: 'iqtlabs/poseidon-api:v0.17.17'
         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.17.17'
         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.17.17'
         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