瀏覽代碼

Merge pull request #139 from meienberger/fix/stop-script

fix: stop script running apps
Nicolas Meienberger 3 年之前
父節點
當前提交
488e57c586
共有 2 個文件被更改,包括 12 次插入17 次删除
  1. 1 1
      docker-compose.yml
  2. 11 16
      scripts/stop.sh

+ 1 - 1
docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.9"
 
 services:
   reverse-proxy:

+ 11 - 16
scripts/stop.sh

@@ -23,22 +23,17 @@ cd "$ROOT_FOLDER"
 export DOCKER_CLIENT_TIMEOUT=240
 export COMPOSE_HTTP_TIMEOUT=240
 
-function get_json_field() {
-  local json_file="$1"
-  local field="$2"
-
-  echo $(jq -r ".${field}" "${json_file}")
-}
-
-str=$(get_json_field ${STATE_FOLDER}/apps.json installed)
-apps_to_start=($str)
-
-# If apps_to_start is not empty, then we're stopping all apps
-if [[ ${#apps_to_start[@]} -gt 0 ]]; then
-  for app in "${apps_to_start[@]}"; do
-    "${ROOT_FOLDER}/scripts/app.sh" stop $app
-  done
-fi
+# Get all app names from the apps folder
+apps_folder="${ROOT_FOLDER}/apps"
+apps_names=($(ls -d ${apps_folder}/*/ | xargs -n 1 basename | sed 's/\///g'))
+
+for app_name in "${apps_names[@]}"; do
+  # if folder ${ROOT_FOLDER}/app-data/app_name exists, then stop app
+  if [[ -d "${ROOT_FOLDER}/app-data/${app_name}" ]]; then
+    echo "Stopping ${app_name}"
+    "${ROOT_FOLDER}/scripts/app.sh" stop $app_name
+  fi
+done
 
 echo "Stopping Docker services..."
 echo