ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2025-04-15 22:56:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure default values are used for mounted data directories as well

Browse Source
This commit is contained in:
cytopia 2018-09-22 12:13:25 +02:00
parent ba3dd31729
commit bb1b72d9af
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docker-compose.yml
View File

@ -172,7 +172,7 @@ services:
- ${HOST_PATH_HTTPD_DATADIR}:/shared/httpd:rw${MOUNT_OPTIONS}
# Mount logs
- ${DEVILBOX_PATH}/log/php-fpm-${PHP_SERVER}:/var/log/php:rw${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/log/php-fpm-${PHP_SERVER:-7.0}:/var/log/php:rw${MOUNT_OPTIONS}
# Mount Mail directory
- devilbox-mail:/var/mail:rw${MOUNT_OPTIONS}
@ -182,15 +182,15 @@ services:
# Mount devilbox user-defined *.ini files in order
# to overwrite the default PHP.ini configuration
- ${DEVILBOX_PATH}/cfg/php-ini-${PHP_SERVER}:/etc/php-custom.d:ro${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/cfg/php-ini-${PHP_SERVER:-7.0}:/etc/php-custom.d:ro${MOUNT_OPTIONS}
# Mount devilbox user-defined PHP-FPM *.conf files in order
# to overwrite the default PHP-FPM configuration
- ${DEVILBOX_PATH}/cfg/php-fpm-${PHP_SERVER}:/etc/php-fpm-custom.d:ro${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/cfg/php-fpm-${PHP_SERVER:-7.0}:/etc/php-fpm-custom.d:ro${MOUNT_OPTIONS}
# Mount devilbox user-defined *.so files in order
# to load custom PHP modules
- ${DEVILBOX_PATH}/mod/php-fpm-${PHP_SERVER}:/usr/lib64/php/custom-modules:ro${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/mod/php-fpm-${PHP_SERVER:-7.0}:/usr/lib64/php/custom-modules:ro${MOUNT_OPTIONS}
# Mount devilbox user-defined PHP-FPM startup *.sh scripts
- ${DEVILBOX_PATH}/cfg/php-startup-${PHP_SERVER}:/startup.1.d:rw${MOUNT_OPTIONS}
@ -289,13 +289,13 @@ services:
- ${HOST_PATH_HTTPD_DATADIR}:/shared/httpd:rw${MOUNT_OPTIONS}
# Mount custom web server config directory
- ${DEVILBOX_PATH}/cfg/${HTTPD_SERVER}:/etc/httpd-custom.d:rw${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/cfg/${HTTPD_SERVER:-nginx-stable}:/etc/httpd-custom.d:rw${MOUNT_OPTIONS}
# Mount custom vhost-templates
- ${DEVILBOX_PATH}/cfg/vhost-gen:/etc/vhost-gen.d:rw${MOUNT_OPTIONS}
# Mount logs
- ${DEVILBOX_PATH}/log/${HTTPD_SERVER}:/var/log/${HTTPD_SERVER}:rw${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/log/${HTTPD_SERVER:-nginx-stable}:/var/log/${HTTPD_SERVER}:rw${MOUNT_OPTIONS}
# Certificate Authority public key
- ${DEVILBOX_PATH}/ca:/ca:rw${MOUNT_OPTIONS}
@ -352,14 +352,14 @@ services:
# HOST-DIRECTORY : DOCKER-DIRECTORY
# Mount logs
- ${DEVILBOX_PATH}/log/${MYSQL_SERVER}:/var/log/mysql:rw${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/log/${MYSQL_SERVER:-mariadb-10.1}:/var/log/mysql:rw${MOUNT_OPTIONS}
# Mount devilbox default overwrites
- ${DEVILBOX_PATH}/.devilbox/etc/${MYSQL_SERVER}:/etc/mysql/conf.d:ro${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/.devilbox/etc/${MYSQL_SERVER:-mariadb-10.1}:/etc/mysql/conf.d:ro${MOUNT_OPTIONS}
# Mount devilbox user-defined cnf files in order
# to overwrite the MySQL server configuration
- ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER}:/etc/mysql/docker-default.d:ro${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER:-mariadb-10.1}:/etc/mysql/docker-default.d:ro${MOUNT_OPTIONS}
# Mount MySQL Data directory
- devilbox-${MYSQL_SERVER:-mariadb-10.1}:/var/lib/mysql:rw${MOUNT_OPTIONS}
@ -396,7 +396,7 @@ services:
# HOST-DIRECTORY : DOCKER-DIRECTORY
# Mount logs
- ${DEVILBOX_PATH}/log/pgsql-${PGSQL_SERVER}:/var/log/postgresql:rw${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/log/pgsql-${PGSQL_SERVER:-9.6}:/var/log/postgresql:rw${MOUNT_OPTIONS}
# Mount PostgreSQL Data directory
- devilbox-pgsql-${PGSQL_SERVER:-9.6}:/var/lib/postgresql/data/pgdata:rw${MOUNT_OPTIONS}
@ -460,7 +460,7 @@ services:
# HOST-DIRECTORY : DOCKER-DIRECTORY
# Mount logs
- ${DEVILBOX_PATH}/log/memcd-${MEMCD_SERVER}:/var/log/memcd:rw${MOUNT_OPTIONS}
- ${DEVILBOX_PATH}/log/memcd-${MEMCD_SERVER:-latest}:/var/log/memcd:rw${MOUNT_OPTIONS}
depends_on:
- bind