Skip to content

Commit bf50d2b

Browse files
committed
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
2 parents 11bb639 + c1e7842 commit bf50d2b

6 files changed

Lines changed: 77 additions & 8 deletions

File tree

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
/log/[a-z0-9-]*
2020

2121
# Ignore Data dirs
22-
/data/mongo/*
23-
/data/mysql/*
24-
/data/pgsql/*
25-
/data/rabbit/*
2622
/data/www/*
2723

2824
# Ignore Certificate Authority

data/mongo/.keepme

Whitespace-only changes.

data/mysql/.keepme

Whitespace-only changes.

data/pgsql/.keepme

Whitespace-only changes.

data/rabbit/.keepme

Whitespace-only changes.

docker-compose.yml

Lines changed: 77 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ services:
175175
- ${DEVILBOX_PATH}/log/php-fpm-${PHP_SERVER}:/var/log/php:rw${MOUNT_OPTIONS}
176176

177177
# Mount Mail directory
178-
- ${DEVILBOX_PATH}/mail:/var/mail:rw${MOUNT_OPTIONS}
178+
- devilbox-mail:/var/mail:rw${MOUNT_OPTIONS}
179179

180180
# Mount DB Backup directory
181181
- ${DEVILBOX_PATH}/backups:/shared/backups:rw${MOUNT_OPTIONS}
@@ -356,7 +356,7 @@ services:
356356
- ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER}:/etc/mysql/docker-default.d:ro${MOUNT_OPTIONS}
357357

358358
# Mount MySQL Data directory
359-
- ${HOST_PATH_MYSQL_DATADIR}/${MYSQL_SERVER}:/var/lib/mysql:rw${MOUNT_OPTIONS}
359+
- devilbox-${MYSQL_SERVER}:/var/lib/mysql:rw${MOUNT_OPTIONS}
360360

361361
depends_on:
362362
- bind
@@ -393,7 +393,7 @@ services:
393393
- ${DEVILBOX_PATH}/log/pgsql-${PGSQL_SERVER}:/var/log/postgresql:rw${MOUNT_OPTIONS}
394394

395395
# Mount PostgreSQL Data directory
396-
- ${HOST_PATH_PGSQL_DATADIR}/${PGSQL_SERVER}:/var/lib/postgresql/data/pgdata:rw${MOUNT_OPTIONS}
396+
- devilbox-pgsql-${PGSQL_SERVER}:/var/lib/postgresql/data/pgdata:rw${MOUNT_OPTIONS}
397397

398398
depends_on:
399399
- bind
@@ -482,7 +482,7 @@ services:
482482
# HOST-DIRECTORY : DOCKER-DIRECTORY
483483

484484
# Mount MongoDB Data directory
485-
- ${HOST_PATH_MONGO_DATADIR}/${MONGO_SERVER}:/data/db:rw${MOUNT_OPTIONS}
485+
- devilbox-mongo-${MONGO_SERVER}:/data/db:rw${MOUNT_OPTIONS}
486486

487487
depends_on:
488488
- bind
@@ -503,3 +503,76 @@ networks:
503503
config:
504504
- subnet: 172.16.238.0/24
505505
gateway: 172.16.238.1
506+
507+
508+
################################################################################
509+
# VOLUMES
510+
################################################################################
511+
volumes:
512+
# ------------------------------------------------------------
513+
# Misc
514+
# ------------------------------------------------------------
515+
devilbox-mail:
516+
517+
# ------------------------------------------------------------
518+
# MySQL
519+
# ------------------------------------------------------------
520+
devilbox-mysql-5.5:
521+
devilbox-mysql-5.6:
522+
devilbox-mysql-5.7:
523+
devilbox-mysql-8.0:
524+
devilbox-mariadb-5.5:
525+
devilbox-mariadb-10.0:
526+
devilbox-mariadb-10.1:
527+
devilbox-mariadb-10.2:
528+
devilbox-mariadb-10.3:
529+
devilbox-percona-5.5:
530+
devilbox-percona-5.6:
531+
devilbox-percona-5.7:
532+
533+
# ------------------------------------------------------------
534+
# Postgres
535+
# ------------------------------------------------------------
536+
devilbox-pgsql-9.0:
537+
devilbox-pgsql-9.1:
538+
devilbox-pgsql-9.2:
539+
devilbox-pgsql-9.2-alpine:
540+
devilbox-pgsql-9.3:
541+
devilbox-pgsql-9.3-alpine:
542+
devilbox-pgsql-9.4:
543+
devilbox-pgsql-9.4-alpine:
544+
devilbox-pgsql-9.5:
545+
devilbox-pgsql-9.5-alpine:
546+
devilbox-pgsql-9.6:
547+
devilbox-pgsql-9.6-alpine:
548+
devilbox-pgsql-10.0:
549+
devilbox-pgsql-10.0-alpine:
550+
devilbox-pgsql-10.1:
551+
devilbox-pgsql-10.1-alpine:
552+
devilbox-pgsql-10.2:
553+
devilbox-pgsql-10.2-alpine:
554+
devilbox-pgsql-10.3:
555+
devilbox-pgsql-10.3-alpine:
556+
devilbox-pgsql-10.4:
557+
devilbox-pgsql-10.4-alpine:
558+
devilbox-pgsql-10.5:
559+
devilbox-pgsql-10.5-alpine:
560+
devilbox-pgsql-10.6:
561+
devilbox-pgsql-10.6-alpine:
562+
devilbox-pgsql-11.0:
563+
devilbox-pgsql-11.0-alpine:
564+
devilbox-pgsql-11.1:
565+
devilbox-pgsql-11.1-alpine:
566+
devilbox-pgsql-latest:
567+
devilbox-pgsql-alpine:
568+
569+
# ------------------------------------------------------------
570+
# MongoDB
571+
# ------------------------------------------------------------
572+
devilbox-mongo-2.8:
573+
devilbox-mongo-3.0:
574+
devilbox-mongo-3.2:
575+
devilbox-mongo-3.4:
576+
devilbox-mongo-3.6:
577+
devilbox-mongo-4.0:
578+
devilbox-mongo-latest:

0 commit comments

Comments
 (0)