Update 'root/usr/libexec/apps/gotify/gotify.sh'

root/usr/libexec/apps/gotify/gotify.sh

@@ -4,24 +4,17 @@ ACTION=${1}
 shift 1
 
 get_image() {
-  IMAGE_NAME="gotify/server"
+  IMAGE_NAME=$(uci get gotify.@gotify[0].image_name 2>/dev/null)
 }
 
 do_install_detail() {
-  local config=`uci get gotify.@gotify[0].config_path 2>/dev/null`
-  local port=`uci get gotify.@gotify[0].port 2>/dev/null`
-  local IMAGE_NAME=`uci get gotify.@gotify[0].image_name 2>/dev/null`
-  local username=`uci get gotify.@gotify[0].username 2>/dev/null`
-  local password=`uci get gotify.@gotify[0].password 2>/dev/null`
+  local config=$(uci get gotify.@gotify[0].config_path 2>/dev/null)
+  local port=$(uci get gotify.@gotify[0].port 2>/dev/null)
+  local IMAGE_NAME=$(uci get gotify.@gotify[0].image_name 2>/dev/null)
+  local username=$(uci get gotify.@gotify[0].username 2>/dev/null)
+  local password=$(uci get gotify.@gotify[0].password 2>/dev/null)
 
-  #Generate the generic environment variables for the docker-compose
-
-  GEN_PASS=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo)
-  GEN_PASS2=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo)
-  
-  # Get our local LAN IP Address
   LAN_IP=$(uci get network.lan.ipaddr)
-  # Strip trailing network mask
   LAN_IP="${LAN_IP%/*}"
 
   if [ -z "$config" ]; then
@@ -32,40 +25,31 @@ do_install_detail() {
   [ -z "$port" ] && port=8050
   [ -z "$IMAGE_NAME" ] && IMAGE_NAME=gotify/server
 
+  rm -R /opt/docker2/compose/gotify-app
+  mkdir /opt/docker2/compose/gotify-app
 
-  # Create Docker Compose file with custom variables
-   
-  # Create Docker Compose file with custom variables
-cat > docker-compose.yml <<EOF
-version: "3"
+  touch /opt/docker2/compose/gotify-app/docker-compose.yml
+  cat > /opt/docker2/compose/gotify-app/docker-compose.yml <<EOF
+version: '3.7'
 services:
-  app:
-    image: gotify/server
-    container_name: gotify
-    restart: unless-stopped
+  gotify:
+    image: $IMAGE_NAME
+    restart: always
     ports:
       - ${LAN_IP}:$port:80
-    environment:
-      - TZ='Africa/Casablanca'
-    volumes:
-      - ./data:/app/data
     labels:
       plugsy.name: "Gotify"
       plugsy.category: "Home"
-      plugsy.icon: "@styled-icons/material-sharp/Notifications"
       plugsy.link: "http://${LAN_IP}:$port"
-
 EOF
 
-  docker-compose up -d
+  docker-compose -f /opt/docker2/compose/gotify-app/docker-compose.yml up -d
 
-  # Add a new list option to the "shortcutmenu" configuration file
   uci add shortcutmenu lists
   uci set shortcutmenu.@lists[-1].webname="$IMAGE_NAME"
   uci set shortcutmenu.@lists[-1].weburl="$LAN_IP:$port"
   uci set shortcutmenu.@lists[-1].webpath="/"
   uci commit shortcutmenu
-
 }
 
 usage() {
@@ -79,28 +63,40 @@ usage() {
 }
 
 case ${ACTION} in
-  "install")
-    get_image
-    do_install_detail
-  ;;
-  "upgrade")
+  "install"|"upgrade")
     get_image
     do_install_detail
   ;;
   "rm")
-    docker rm -f gotify
+    get_image
+    CONTAINER_IDS=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.ID}}')
+    echo "Stopping and removing containers..."
+    for ID in $CONTAINER_IDS; do
+      docker stop $ID
+      docker rm $ID
+    done
+    docker rmi -f $IMAGE_NAME
   ;;
-  "start" | "stop" | "restart")
-    docker ${ACTION} gotify
+  "start"|"stop"|"restart")
+    get_image
+    CONTAINER_IDS=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.ID}}')
+    for ID in $CONTAINER_IDS; do
+      docker ${ACTION} ${ID}
+    done
   ;;
   "status")
-    docker ps --all -f 'name=gotify' --format '{{.State}}'
+    get_image
+    CONTAINER_NAMES=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.Names}}')
+    docker ps --all -f "name=${CONTAINER_NAMES}" --format '{{.Status}}'
   ;;
   "port")
-    docker ps --all -f 'name=gotify' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
+    get_image
+    CONTAINER_NAMES=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.Names}}')
+    docker ps --all -f "name=${CONTAINER_NAMES}" --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
   ;;
   *)
     usage
     exit 1
   ;;
 esac
+