Allow optional mounting of storage folders per app

Author: CLHatch

.scripts/yml_merge.sh

@@ -60,7 +60,26 @@ commands_yml_merge() {
                     fi
                 fi
                 local APPSTORAGE
-                APPSTORAGE="$(run_script 'env_get' DOCKER_MULTIPLE_STORAGE)"
+                MultipleStorage="$(run_script 'env_get' DOCKER_MULTIPLE_STORAGE)"
+                local -a StorageNumbers=('')
+                if [[ -n ${MultipleStorage-} && ${MultipleStorage^^} =~ ON|TRUE|YES ]]; then
+                    StorageNumbers+=(2 3 4)
+                fi
+                for Number in "${StorageNumbers[@]}"; do
+                    local StorageOn="$(run_script 'env_get' "${APPNAME}__STORAGE${Number}")"
+                    if [[ -n ${StorageOn-} && ${StorageOn^^} =~ ON|TRUE|YES ]]; then
+                        local StorageVolume="$(run_script 'env_get' "DOCKER_VOLUME_STORAGE${Number}")"
+                        if [[ -n ${StorageVolume} ]]; then
+                            local storage_yml
+                            storage_yml="$(run_script 'app_instance_file' "${appname}" ".storage${Number}.yml")"
+                            if [[ -f ${storage_yml} ]]; then
+                                COMPOSE_FILE="${COMPOSE_FILE}:${storage_yml}"
+                            else
+                                info "${storage_yml} does not exist."
+                            fi
+                        fi
+                    fi
+                done
                 if [[ -n ${APPSTORAGE-} && ${APPSTORAGE^^} =~ ON|TRUE|YES ]]; then
                     local storage_yml
                     storage_yml="$(run_script 'app_instance_file' "${appname}" ".storage.yml")"

compose/.apps/actualbudget/actualbudget.storage.yml

@@ -1,6 +1,4 @@
 services:
   actualbudget<__instance>:
     volumes:
-      - ${DOCKER_VOLUME_STORAGE2?}:/storage2
-      - ${DOCKER_VOLUME_STORAGE3?}:/storage3
-      - ${DOCKER_VOLUME_STORAGE4?}:/storage4
+      - ${DOCKER_VOLUME_STORAGE?}:/storage

compose/.apps/actualbudget/actualbudget.storage2.yml

@@ -0,0 +1,4 @@
+services:
+  actualbudget<__instance>:
+    volumes:
+      - ${DOCKER_VOLUME_STORAGE2?}:/storage2

compose/.apps/actualbudget/actualbudget.storage3.yml

@@ -0,0 +1,4 @@
+services:
+  actualbudget<__instance>:
+    volumes:
+      - ${DOCKER_VOLUME_STORAGE3?}:/storage3

compose/.apps/actualbudget/actualbudget.storage4.yml

@@ -0,0 +1,4 @@
+services:
+  actualbudget<__instance>:
+    volumes:
+      - ${DOCKER_VOLUME_STORAGE4?}:/storage4

compose/.apps/adguard/adguard.storage.yml

@@ -1,6 +1,4 @@
 services:
   adguard<__instance>:
     volumes:
-      - ${DOCKER_VOLUME_STORAGE2?}:/storage2
-      - ${DOCKER_VOLUME_STORAGE3?}:/storage3
-      - ${DOCKER_VOLUME_STORAGE4?}:/storage4
+      - ${DOCKER_VOLUME_STORAGE?}:/storage

compose/.apps/adguard/adguard.storage2.yml

@@ -0,0 +1,4 @@
+services:
+  adguard<__instance>:
+    volumes:
+      - ${DOCKER_VOLUME_STORAGE2?}:/storage2

compose/.apps/adguard/adguard.storage3.yml

@@ -0,0 +1,4 @@
+services:
+  adguard<__instance>:
+    volumes:
+      - ${DOCKER_VOLUME_STORAGE3?}:/storage3

compose/.apps/adguard/adguard.storage4.yml

@@ -0,0 +1,4 @@
+services:
+  adguard<__instance>:
+    volumes:
+      - ${DOCKER_VOLUME_STORAGE4?}:/storage4

compose/.apps/adminer/adminer.storage.yml

@@ -1,6 +1,4 @@
 services:
   adminer<__instance>:
     volumes:
-      - ${DOCKER_VOLUME_STORAGE2?}:/storage2
-      - ${DOCKER_VOLUME_STORAGE3?}:/storage3
-      - ${DOCKER_VOLUME_STORAGE4?}:/storage4
+      - ${DOCKER_VOLUME_STORAGE?}:/storage