Merge pull request #1910 from anarkiwi/rel

0.15.4
faucetsdn · Sep 18, 2020 · ad2a419 · ad2a419
2 parents 4873c6c + 7fb3a45
commit ad2a419
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
+# v0.15.4 (2020-09-18)
+
+* Updated faucetconfrpc (move certstrap to faucetconfrpc)
+* Fix handling of empty faucet.yaml
+* Updated pytype, pytest, prometheus, texttable, ruamel.yaml, cmd2
+
 # v0.15.3 (2020-09-04)
 
-- Updated cmd2, pytype, faucetconfrpc
+* Updated cmd2, pytype, faucetconfrpc
 
 # v0.15.2 (2020-08-27)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.15.4.dev
+0.15.4
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.4'
         volumes:
             - '${POSEIDON_PREFIX}/opt/redis:/data'
         networks:
             poseidon:
     rabbit:
         restart: always
-        image: 'iqtlabs/rabbitmq:latest'
+        image: 'iqtlabs/rabbitmq:v0.15.4'
         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.4'
         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.4'
         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.4'
         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