From 7c9d8d4fdcc4d60dad5119d764da9a79972b4cb4 Mon Sep 17 00:00:00 2001
From: Josh Bailey <josh@vandervecken.com>
Date: Tue, 11 Jan 2022 08:01:28 +0000
Subject: [PATCH 1/2] 0.17.18

---
 CHANGELOG.md        |  6 ++++++
 VERSION             |  2 +-
 docker-compose.yaml | 20 ++++----------------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 539bf97cd..aa4d6728d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v0.17.18 (2022-01-01)
+
+* Upgrade to OVS 2.16.2
+* Upgrade network-tools
+* Upgrade faucetconfrpc, faucet, gauge, httpx, ruamel.yaml, prometheus, grafana, cmd2, pbr, pylint, pytype
+
 # 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).
diff --git a/VERSION b/VERSION
index 5f17a606e..a7a22521c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.17.18.dev
+0.17.18
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 62a128b94..400bf174b 100644
--- 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.18'
         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.31'
@@ -28,7 +25,7 @@ services:
             poseidon:
     poseidon_api:
         restart: always
-        image: 'iqtlabs/poseidon-api:latest'
+        image: 'iqtlabs/poseidon-api:v0.17.18'
         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.18'
         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.18'
         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

From bb3999a45d33c37333cbdce2a65b3b22fe4022e9 Mon Sep 17 00:00:00 2001
From: Josh Bailey <josh@vandervecken.com>
Date: Wed, 12 Jan 2022 04:37:32 +0000
Subject: [PATCH 2/2] Upgrade networkml.

---
 CHANGELOG.md         | 2 +-
 workers/workers.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa4d6728d..087eaa989 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # v0.17.18 (2022-01-01)
 
 * Upgrade to OVS 2.16.2
-* Upgrade network-tools
+* Upgrade network-tools, networkml
 * Upgrade faucetconfrpc, faucet, gauge, httpx, ruamel.yaml, prometheus, grafana, cmd2, pbr, pylint, pytype
 
 # v0.17.17 (2021-11-11)
diff --git a/workers/workers.json b/workers/workers.json
index 74b8b30f8..4e9acdd1e 100644
--- a/workers/workers.json
+++ b/workers/workers.json
@@ -51,7 +51,7 @@
         "rabbitmq"
       ],
       "stage": "poseidon_poseidon",
-      "version": "v0.6.17",
+      "version": "v0.6.18",
       "viewableOutput": true
     },
     {