Merge branch 'docker-volumes' into release/v1.0.0

* docker-volumes: Clean up docker-compose.yml Ensure mail uses a Docker volume Remove unecessary data dirs Update container versions Ensure default values are used for mounted data directories as well Refs #175, Refs #382 Use Docker volumes instead of data directories
cytopia · Feb 10, 2019 · bf50d2b · bf50d2b
2 parents 11bb639 + c1e7842
commit bf50d2b
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,10 +19,6 @@
 /log/[a-z0-9-]*
 
 # Ignore Data dirs
-/data/mongo/*
-/data/mysql/*
-/data/pgsql/*
-/data/rabbit/*
 /data/www/*
 
 # Ignore Certificate Authority

diff --git a/data/mongo/.keepme b/data/mongo/.keepme
diff --git a/data/mysql/.keepme b/data/mysql/.keepme
diff --git a/data/pgsql/.keepme b/data/pgsql/.keepme
diff --git a/data/rabbit/.keepme b/data/rabbit/.keepme
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -175,7 +175,7 @@ services:
       - ${DEVILBOX_PATH}/log/php-fpm-${PHP_SERVER}:/var/log/php:rw${MOUNT_OPTIONS}
 
       # Mount Mail directory
-      - ${DEVILBOX_PATH}/mail:/var/mail:rw${MOUNT_OPTIONS}
+      - devilbox-mail:/var/mail:rw${MOUNT_OPTIONS}
 
       # Mount DB Backup directory
       - ${DEVILBOX_PATH}/backups:/shared/backups:rw${MOUNT_OPTIONS}
@@ -356,7 +356,7 @@ services:
       - ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER}:/etc/mysql/docker-default.d:ro${MOUNT_OPTIONS}
 
       # Mount MySQL Data directory
-      - ${HOST_PATH_MYSQL_DATADIR}/${MYSQL_SERVER}:/var/lib/mysql:rw${MOUNT_OPTIONS}
+      - devilbox-${MYSQL_SERVER}:/var/lib/mysql:rw${MOUNT_OPTIONS}
 
     depends_on:
       - bind
@@ -393,7 +393,7 @@ services:
       - ${DEVILBOX_PATH}/log/pgsql-${PGSQL_SERVER}:/var/log/postgresql:rw${MOUNT_OPTIONS}
 
       # Mount PostgreSQL Data directory
-      - ${HOST_PATH_PGSQL_DATADIR}/${PGSQL_SERVER}:/var/lib/postgresql/data/pgdata:rw${MOUNT_OPTIONS}
+      - devilbox-pgsql-${PGSQL_SERVER}:/var/lib/postgresql/data/pgdata:rw${MOUNT_OPTIONS}
 
     depends_on:
       - bind
@@ -482,7 +482,7 @@ services:
       # HOST-DIRECTORY : DOCKER-DIRECTORY
 
       # Mount MongoDB Data directory
-      - ${HOST_PATH_MONGO_DATADIR}/${MONGO_SERVER}:/data/db:rw${MOUNT_OPTIONS}
+      - devilbox-mongo-${MONGO_SERVER}:/data/db:rw${MOUNT_OPTIONS}
 
     depends_on:
       - bind
@@ -503,3 +503,76 @@ networks:
       config:
         - subnet: 172.16.238.0/24
           gateway: 172.16.238.1
+
+
+################################################################################
+# VOLUMES
+################################################################################
+volumes:
+  # ------------------------------------------------------------
+  # Misc
+  # ------------------------------------------------------------
+  devilbox-mail:
+
+  # ------------------------------------------------------------
+  # MySQL
+  # ------------------------------------------------------------
+  devilbox-mysql-5.5:
+  devilbox-mysql-5.6:
+  devilbox-mysql-5.7:
+  devilbox-mysql-8.0:
+  devilbox-mariadb-5.5:
+  devilbox-mariadb-10.0:
+  devilbox-mariadb-10.1:
+  devilbox-mariadb-10.2:
+  devilbox-mariadb-10.3:
+  devilbox-percona-5.5:
+  devilbox-percona-5.6:
+  devilbox-percona-5.7:
+
+  # ------------------------------------------------------------
+  # Postgres
+  # ------------------------------------------------------------
+  devilbox-pgsql-9.0:
+  devilbox-pgsql-9.1:
+  devilbox-pgsql-9.2:
+  devilbox-pgsql-9.2-alpine:
+  devilbox-pgsql-9.3:
+  devilbox-pgsql-9.3-alpine:
+  devilbox-pgsql-9.4:
+  devilbox-pgsql-9.4-alpine:
+  devilbox-pgsql-9.5:
+  devilbox-pgsql-9.5-alpine:
+  devilbox-pgsql-9.6:
+  devilbox-pgsql-9.6-alpine:
+  devilbox-pgsql-10.0:
+  devilbox-pgsql-10.0-alpine:
+  devilbox-pgsql-10.1:
+  devilbox-pgsql-10.1-alpine:
+  devilbox-pgsql-10.2:
+  devilbox-pgsql-10.2-alpine:
+  devilbox-pgsql-10.3:
+  devilbox-pgsql-10.3-alpine:
+  devilbox-pgsql-10.4:
+  devilbox-pgsql-10.4-alpine:
+  devilbox-pgsql-10.5:
+  devilbox-pgsql-10.5-alpine:
+  devilbox-pgsql-10.6:
+  devilbox-pgsql-10.6-alpine:
+  devilbox-pgsql-11.0:
+  devilbox-pgsql-11.0-alpine:
+  devilbox-pgsql-11.1:
+  devilbox-pgsql-11.1-alpine:
+  devilbox-pgsql-latest:
+  devilbox-pgsql-alpine:
+
+  # ------------------------------------------------------------
+  # MongoDB
+  # ------------------------------------------------------------
+  devilbox-mongo-2.8:
+  devilbox-mongo-3.0:
+  devilbox-mongo-3.2:
+  devilbox-mongo-3.4:
+  devilbox-mongo-3.6:
+  devilbox-mongo-4.0:
+  devilbox-mongo-latest: