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

root/usr/libexec/apps/alltube/alltube.sh

@@ -4,18 +4,17 @@ ACTION=${1}
 shift 1
 
 get_image() {
-  IMAGE_NAME="rudloff/alltube"
+  IMAGE_NAME=$(uci get alltube.@alltube[0].image_name 2>/dev/null)
 }
 
 do_install_detail() {
-  local config=`uci get alltube.@alltube[0].config_path 2>/dev/null`
+  local config=$(uci get alltube.@alltube[0].config_path 2>/dev/null)
-  local port=`uci get alltube.@alltube[0].port 2>/dev/null`
+  local port=$(uci get alltube.@alltube[0].port 2>/dev/null)
-  local IMAGE_NAME=`uci get alltube.@alltube[0].image_name 2>/dev/null`
+  local IMAGE_NAME=$(uci get alltube.@alltube[0].image_name 2>/dev/null)
-  local username=`uci get alltube.@alltube[0].username 2>/dev/null`
+  local username=$(uci get alltube.@alltube[0].username 2>/dev/null)
-  local password=`uci get alltube.@alltube[0].password 2>/dev/null`
+  local password=$(uci get alltube.@alltube[0].password 2>/dev/null)
-
-  #Generate the generic environment variables for the docker-compose
 
+  # Generate random passwords similar to Searxng script
   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)
   
@@ -23,44 +22,37 @@ do_install_detail() {
   LAN_IP=$(uci get network.lan.ipaddr)
   # Strip trailing network mask
   LAN_IP="${LAN_IP%/*}"
-   
-  if [ -z "$config" ]; then
-      echo "config path is empty!"
-      exit 1
-  fi
 
+  [ -z "$config" ] && echo "config path is empty!" && exit 1
   [ -z "$port" ] && port=5993
   [ -z "$IMAGE_NAME" ] && IMAGE_NAME=rudloff/alltube
 
-  
-  # Create Docker Compose file with custom variables
-   
   # Create Docker Compose file with custom variables
-touch docker-compose.yml
+  rm -R /opt/docker2/compose/alltube-app
-cat > docker-compose.yml <<EOF
+  mkdir /opt/docker2/compose/alltube-app
+  touch /opt/docker2/compose/alltube-app/docker-compose.yml
+  cat > /opt/docker2/compose/alltube-app/docker-compose.yml <<EOF
 version: '3.3'
 services:
     alltube:
-        container_name: alltube
+        image: $IMAGE_NAME
         ports:
-            - '${port}:80'
+            - ${LAN_IP}:$port:80
         environment:
             - PUID=1026
             - PGID=100
             - TZ=Europe/Bucharest
         restart: always
-        image: rudloff/alltube
 EOF
   
-  docker-compose up -d
+  docker-compose -f /opt/docker2/compose/alltube-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() {
@@ -74,28 +66,38 @@ usage() {
 }
 
 case ${ACTION} in
-  "install")
+  "install"|"upgrade")
-    get_image
-    do_install_detail
-  ;;
-  "upgrade")
     get_image
     do_install_detail
   ;;
   "rm")
-    docker rm -f alltube
+    get_image
+    CONTAINER_IDS=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.ID}}')
+    for ID in $CONTAINER_IDS; do
+      docker stop $ID
+      docker rm $ID
+    done
+    docker rmi -f $IMAGE_NAME
   ;;
-  "start" | "stop" | "restart")
+  "start"|"stop"|"restart")
-    docker ${ACTION} alltube
+    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=alltube' --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=alltube' --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
+esac