Merge pull request #1791 from GhostWriters/feat/remove-reqs

fix: 🔇 remove reqs to fix version warning

.scripts/yml_merge.sh

@@ -5,12 +5,8 @@ IFS=$'\n\t'
 yml_merge() {
     run_script 'appvars_create_all'
     run_script 'env_update'
-    info "Compiling enabled templates to merge docker-compose.yml file."
-    local COMPOSE_FILE
-    COMPOSE_FILE="${SCRIPTPATH}/compose/.reqs/r1.yml"
-    COMPOSE_FILE="${COMPOSE_FILE}:${SCRIPTPATH}/compose/.reqs/r2.yml"
-    info "Required files included."
-    notice "Adding compose configurations for enabled apps. Please be patient, this can take a while."
+    local COMPOSE_FILE=""
+    notice "Adding enabled app templates to merge docker-compose.yml. Please be patient, this can take a while."
     while IFS= read -r line; do
         local APPNAME=${line%%_ENABLED=*}
         local FILENAME=${APPNAME,,}
@@ -58,8 +54,11 @@ yml_merge() {
             error "${APPTEMPLATES}/ does not exist."
         fi
     done < <(grep --color=never -P '_ENABLED='"'"'?true'"'"'?$' "${COMPOSE_ENV}")
+    if [[ -z ${COMPOSE_FILE} ]]; then
+        fatal "No enabled apps found."
+    fi
     info "Running compose config to create docker-compose.yml file from enabled templates."
-    export COMPOSE_FILE="${COMPOSE_FILE}"
+    export COMPOSE_FILE="${COMPOSE_FILE#:}"
     eval "docker compose --project-directory ${SCRIPTPATH}/compose/ config > ${SCRIPTPATH}/compose/docker-compose.yml" || fatal "Failed to output compose config.\nFailing command: ${F[C]}docker compose --project-directory ${SCRIPTPATH}/compose/ config > \"${SCRIPTPATH}/compose/docker-compose.yml\""
     info "Merging docker-compose.yml complete."
 }

compose/README.md

@@ -5,7 +5,6 @@
 These should not be modified! `ds -u` will reset these files.
 
 - `.apps` folder contains yml files that are used as templates for DockSTARTer to piece together your main `docker-compose.yml` file
-- `.reqs` folder contains dummy yml files merged to prevent errors
 - `.env.example` file contains the default variables and values for new installs
 
 ## Files generated for your system