Ensure default values are used for mounted data directories as well

Author: cytopia

docker-compose.yml

@@ -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_PATH}/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 bash config
       - ${DEVILBOX_PATH}/bash:/etc/bashrc-devilbox.d:rw${MOUNT_OPTIONS}
@@ -279,13 +279,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}
@@ -342,14 +342,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}
@@ -386,7 +386,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}
@@ -450,7 +450,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