Merge pull request #2165 from anarkiwi/rel

v0.17.5
faucetsdn · Feb 12, 2021 · 022bdc6 · 022bdc6
2 parents f8b80b8 + d3f8a4d
commit 022bdc6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,17 @@
-# v0.17.4 (2020-01-29)
+# v0.17.5 (2021-02-12)
+
+* Upgrade net-tools, networkml, cmd2, eventlet, grafana, pika, rabbitmq
+
+# v0.17.4 (2021-01-29)
 
 * fix metadata merge keyerror
 * Updated crviz, urlib3, certstrap, faucetconfrpc, prometheus, networkml, net-tools
 
-# v0.17.3 (2020-01-15)
+# v0.17.3 (2021-01-15)
 
 * Fix networkml no results.
 
-# v0.17.2 (2020-01-14)
+# v0.17.2 (2021-01-14)
 
 * Major restructuring of codebase, maintaining same functionality
 * Updated poseidon script to use git clone instead of tar file from releases for pbr

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.17.5.dev
+0.17.5
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.5'
         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.20'
@@ -37,7 +34,7 @@ services:
             - poseidon
     poseidon_api:
         restart: always
-        image: 'iqtlabs/poseidon-api:latest'
+        image: 'iqtlabs/poseidon-api:v0.17.5'
         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.5'
         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.5'
         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