Browse Source

feat(script): support user docker-compose.yml and app.env

Freddie Sackur 2 years ago
parent
commit
ba5d923578
1 changed files with 14 additions and 0 deletions
  1. 14 0
      scripts/app.sh

+ 14 - 0
scripts/app.sh

@@ -83,6 +83,18 @@ compose() {
 
 
   local common_compose_file="${ROOT_FOLDER}/repos/${REPO_ID}/apps/docker-compose.common.yml"
   local common_compose_file="${ROOT_FOLDER}/repos/${REPO_ID}/apps/docker-compose.common.yml"
 
 
+  local user_compose_file="${ROOT_FOLDER}/user-config/${app}/docker-compose.yml"
+  local user_compose_args=
+  if [[ -f ${user_compose_file} ]]; then
+    user_compose_args="--file ${user_compose_file}"
+  fi
+
+  local user_env_file="${ROOT_FOLDER}/user-config/${app}/app.env"
+  local user_env_args=
+  if [[ -f ${user_env_file} ]]; then
+    user_env_args="--env-file ${user_env_file}"
+  fi
+
   # Vars to use in compose file
   # Vars to use in compose file
   export APP_DATA_DIR="${STORAGE_PATH}/app-data/${app}"
   export APP_DATA_DIR="${STORAGE_PATH}/app-data/${app}"
   export ROOT_FOLDER_HOST="${ROOT_FOLDER_HOST}"
   export ROOT_FOLDER_HOST="${ROOT_FOLDER_HOST}"
@@ -93,9 +105,11 @@ compose() {
 
 
   docker compose \
   docker compose \
     --env-file "${app_data_dir}/app.env" \
     --env-file "${app_data_dir}/app.env" \
+    ${user_env_args} \
     --project-name "${app}" \
     --project-name "${app}" \
     --file "${app_compose_file}" \
     --file "${app_compose_file}" \
     --file "${common_compose_file}" \
     --file "${common_compose_file}" \
+    ${user_compose_args} \
     "${@}"
     "${@}"
 }
 }