From 7539a1621c7f6e4bbe1c1e5eabd93142bccb8b22 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Thu, 28 Feb 2019 13:59:35 +0100
Subject: [PATCH] Fix Docker Volumes for Compose overrides

---
 compose/docker-compose.override.yml-all      | 15 ++++++++-------
 compose/docker-compose.override.yml-elk      |  8 ++++----
 compose/docker-compose.override.yml-rabbitmq |  5 ++++-
 compose/docker-compose.override.yml-solr     |  4 ++--
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/compose/docker-compose.override.yml-all b/compose/docker-compose.override.yml-all
index 683a5185f..5d7bd8609 100644
--- a/compose/docker-compose.override.yml-all
+++ b/compose/docker-compose.override.yml-all
@@ -58,7 +58,7 @@ services:
       app_net:
         ipv4_address: 172.16.238.210
     volumes:
-      - ${HOST_PATH_RABBIT_DATADIR:-./data/rabbit}/${RABBIT_SERVER:-management}:/var/lib/rabbitmq
+      - devilbox-rabbit:/var/lib/rabbitmq
     depends_on:
       - bind
       - php
@@ -76,7 +76,7 @@ services:
       app_net:
         ipv4_address: 172.16.238.220
     volumes:
-      - data-solr:/opt/solr/server/solr/mycores
+      - devilbox-solr:/opt/solr/server/solr/mycores
     entrypoint:
       - docker-entrypoint.sh
       - solr-precreate
@@ -150,7 +150,7 @@ services:
       - TZ=${TIMEZONE:-UTC}
       - discovery.type=single-node
     volumes:
-      - data-elastic:/usr/share/elasticsearch/data
+      - devilbox-elastic:/usr/share/elasticsearch/data
 
   logstash:
     image: docker.elastic.co/logstash/logstash-oss:${ELK_SERVER:-6.6.1}
@@ -169,7 +169,7 @@ services:
       - CONFIG_RELOAD_INTERVAL=300
       - DB_HOST=DATABASE-SERVER
     volumes:
-      - data-logstash:/var/lib/logstash
+      - devilbox-logstash:/var/lib/logstash
     depends_on:
       - elastic
 
@@ -192,6 +192,7 @@ services:
 ### Volumes
 ###
 volumes:
-  data-solr:
-  data-elastic:
-  data-logstash:
+  devilbox-rabbit:
+  devilbox-solr:
+  devilbox-elastic:
+  devilbox-logstash:
diff --git a/compose/docker-compose.override.yml-elk b/compose/docker-compose.override.yml-elk
index d598ee7e1..8d88a14c6 100644
--- a/compose/docker-compose.override.yml-elk
+++ b/compose/docker-compose.override.yml-elk
@@ -20,7 +20,7 @@ services:
       - TZ=${TIMEZONE:-UTC}
       - discovery.type=single-node
     volumes:
-      - data-elastic:/usr/share/elasticsearch/data
+      - devilbox-elastic:/usr/share/elasticsearch/data
 
   logstash:
     image: docker.elastic.co/logstash/logstash-oss:${ELK_SERVER:-6.6.1}
@@ -39,7 +39,7 @@ services:
       - CONFIG_RELOAD_INTERVAL=300
       - DB_HOST=DATABASE-SERVER
     volumes:
-      - data-logstash:/var/lib/logstash
+      - devilbox-logstash:/var/lib/logstash
     depends_on:
       - elastic
 
@@ -58,5 +58,5 @@ services:
       - elastic
 
 volumes:
-  data-elastic:
-  data-logstash:
+  devilbox-elastic:
+  devilbox-logstash:
diff --git a/compose/docker-compose.override.yml-rabbitmq b/compose/docker-compose.override.yml-rabbitmq
index 9ec65760d..229089a44 100644
--- a/compose/docker-compose.override.yml-rabbitmq
+++ b/compose/docker-compose.override.yml-rabbitmq
@@ -20,8 +20,11 @@ services:
       app_net:
         ipv4_address: 172.16.238.210
     volumes:
-      - ${HOST_PATH_RABBIT_DATADIR:-./data/rabbit}/${RABBIT_SERVER:-management}:/var/lib/rabbitmq
+      - devilbox-rabbit:/var/lib/rabbitmq
     depends_on:
       - bind
       - php
       - httpd
+
+volumes:
+  devilbox-rabbit:
diff --git a/compose/docker-compose.override.yml-solr b/compose/docker-compose.override.yml-solr
index f7820aef6..82eb613bf 100644
--- a/compose/docker-compose.override.yml-solr
+++ b/compose/docker-compose.override.yml-solr
@@ -15,7 +15,7 @@ services:
       app_net:
         ipv4_address: 172.16.238.220
     volumes:
-      - data-solr:/opt/solr/server/solr/mycores
+      - devilbox-solr:/opt/solr/server/solr/mycores
     entrypoint:
       - docker-entrypoint.sh
       - solr-precreate
@@ -26,4 +26,4 @@ services:
       - httpd
 
 volumes:
-  data-solr:
+  devilbox-solr: