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

root/usr/libexec/apps/bookstack/bookstack.sh

@@ -4,45 +4,36 @@ ACTION=${1}
 shift 1
 
 get_image() {
-  IMAGE_NAME="lscr.io/linuxserver/bookstack"
+  IMAGE_NAME=$(uci get bookstack.@bookstack[0].image_name 2>/dev/null)
 }
 
 do_install_detail() {
-  local config=`uci get bookstack.@bookstack[0].config_path 2>/dev/null`
-  local port=`uci get bookstack.@bookstack[0].port 2>/dev/null`
-  local IMAGE_NAME=`uci get bookstack.@bookstack[0].image_name 2>/dev/null`
-  local username=`uci get bookstack.@bookstack[0].username 2>/dev/null`
-  local password=`uci get bookstack.@bookstack[0].password 2>/dev/null`
-
-  #Generate the generic environment variables for the docker-compose
+  local config=$(uci get bookstack.@bookstack[0].config_path 2>/dev/null)
+  local port=$(uci get bookstack.@bookstack[0].port 2>/dev/null)
+  local IMAGE_NAME=$(uci get bookstack.@bookstack[0].image_name 2>/dev/null)
+  local username=$(uci get bookstack.@bookstack[0].username 2>/dev/null)
+  local password=$(uci get bookstack.@bookstack[0].password 2>/dev/null)
 
   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
-      echo "config path is empty!"
-      exit 1
-  fi
-
+  [ -z "$config" ] && echo "config path is empty!" && exit 1
   [ -z "$port" ] && port=6875
-  [ -z "$IMAGE_NAME" ] && IMAGE_NAME=bookstack/node-red:latest
-
-  
-  # Create Docker Compose file with custom variables
+  [ -z "$IMAGE_NAME" ] && IMAGE_NAME=lscr.io/linuxserver/bookstack
 
-  # Create Docker Compose file with custom variables
-touch docker-compose.yml
-cat > docker-compose.yml <<EOF
+  rm -R /opt/docker2/compose/bookstack-app
+  mkdir /opt/docker2/compose/bookstack-app
+  touch /opt/docker2/compose/bookstack-app/docker-compose.yml
+  cat > /opt/docker2/compose/bookstack-app/docker-compose.yml <<EOF
 version: "2"
 services:
   bookstack:
-    image: lscr.io/linuxserver/bookstack
-    container_name: bookstack
+    image: $IMAGE_NAME
+    ports:
+      - ${LAN_IP}:$port:80
     environment:
       - PUID=1000
       - PGID=1000
@@ -52,15 +43,12 @@ services:
       - DB_PASS=${GEN_PASS}
       - DB_DATABASE=bookstackapp
     volumes:
-      - ./data:/config
-    ports:
-      - 6875:80
+      - /opt/docker2/compose/bookstack-app/config:/config
     restart: unless-stopped
     depends_on:
       - bookstack_db
   bookstack_db:
     image: lscr.io/linuxserver/mariadb
-    container_name: bookstack_db
     environment:
       - PUID=1000
       - PGID=1000
@@ -70,24 +58,17 @@ services:
       - MYSQL_USER=bookstack
       - MYSQL_PASSWORD=${GEN_PASS}
     volumes:
-      - ./data:/config
+      - /opt/docker2/compose/bookstack-app/data:/config
     restart: unless-stopped
-    labels:
-      plugsy.name: "Bookstack"
-      plugsy.category: "Home"
-      plugsy.icon: "@styled-icons/simple-icons/BookStack"
-      plugsy.link: "http://${LAN_IP}:$port"
 EOF
 
-  docker-compose up -d
+  docker-compose -f /opt/docker2/compose/bookstack-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() {
@@ -101,28 +82,32 @@ usage() {
 }
 
 case ${ACTION} in
-  "install")
-    get_image
-    do_install_detail
-  ;;
-  "upgrade")
+  "install"|"upgrade")
     get_image
     do_install_detail
   ;;
   "rm")
-    docker rm -f bookstack
+    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")
-    docker ${ACTION} bookstack
+  "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=bookstack' --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=bookstack' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
-  ;;
-  *)
-    usage
-    exit 1
-  ;;
-esac
+    get_image
+    CONTAINER_NAMES=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.Names}}')
+    docker ps --all -f "name=${CONTAINER_NAMES}" --format '{{.Ports}}' |