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

root/usr/libexec/apps/neko/neko.sh

@@ -4,24 +4,18 @@ ACTION=${1}
 shift 1
 
 get_image() {
-  IMAGE_NAME="m1k1o/neko:firefox"
+  IMAGE_NAME=$(uci get neko.@neko[0].image_name 2>/dev/null)
 }
 
 do_install_detail() {
-  local config=`uci get neko.@neko[0].config_path 2>/dev/null`
+  local config=$(uci get neko.@neko[0].config_path 2>/dev/null)
-  local port=`uci get neko.@neko[0].port 2>/dev/null`
+  local port=$(uci get neko.@neko[0].port 2>/dev/null)
-  local IMAGE_NAME=`uci get neko.@neko[0].image_name 2>/dev/null`
+  local IMAGE_NAME=$(uci get neko.@neko[0].image_name 2>/dev/null)
-  local username=`uci get neko.@neko[0].username 2>/dev/null`
-  local password=`uci get neko.@neko[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
@@ -30,14 +24,13 @@ do_install_detail() {
   fi
 
   [ -z "$port" ] && port=8281
-  [ -z "$IMAGE_NAME" ] && IMAGE_NAME=m1k1o/neko:firefox
+  [ -z "$IMAGE_NAME" ] && IMAGE_NAME="m1k1o/neko:firefox"
-
 
-  # Create Docker Compose file with custom variables
+  rm -R /opt/docker2/compose/neko-app
+  mkdir /opt/docker2/compose/neko-app
 
-  # Create Docker Compose file with custom variables
+  touch /opt/docker2/compose/neko-app/docker-compose.yml
-touch docker-compose.yml
+  cat > /opt/docker2/compose/neko-app/docker-compose.yml <<EOF
-cat > docker-compose.yml <<EOF
 version: "3.4"
 services:
   neko:
@@ -60,50 +53,59 @@ services:
       plugsy.link: "http://$config:$port"
 EOF
 
-  docker-compose up -d
+  docker-compose -f /opt/docker2/compose/neko-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="$config:$port"
   uci set shortcutmenu.@lists[-1].webpath="/"
   uci commit shortcutmenu
 
-  echo "Your Neko admin password is: " $GEN_PASS
+  echo "Your Neko admin password is: $GEN_PASS"
   echo "The default password for viewers is: meowmix"
-
 }
 
 usage() {
   echo "usage: $0 sub-command"
   echo "where sub-command is one of:"
-  echo "      install                Install neko"
+  echo "      install                Install Neko"
-  echo "      upgrade                Upgrade neko"
+  echo "      upgrade                Upgrade Neko"
-  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart neko"
+  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart Neko"
-  echo "      status                 neko status"
+  echo "      status                 Neko status"
-  echo "      port                   neko port"
+  echo "      port                   Neko port"
 }
 
 case ${ACTION} in
-  "install")
+  "install"|"upgrade")
-    get_image
-    do_install_detail
-  ;;
-  "upgrade")
     get_image
     do_install_detail
   ;;
   "rm")
-    docker rm -f neko
+    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")
+  "start"|"stop"|"restart")
-    docker ${ACTION} neko
+    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=neko' --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=neko' --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