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

root/usr/libexec/apps/nextcloud/nextcloud.sh

@@ -4,31 +4,20 @@ ACTION=${1}
 shift 1
 
 get_image() {
-  IMAGE_NAME="nextcloud"
+  IMAGE_NAME=$(uci get nextcloud.@nextcloud[0].image_name 2>/dev/null)
 }
 
-do_install() {
+do_install_detail() {
-  get_image
+  local config=$(uci get nextcloud.@nextcloud[0].config_path 2>/dev/null)
-
+  local port=$(uci get nextcloud.@nextcloud[0].port 2>/dev/null)
-  do_install_detail
+  local IMAGE_NAME=$(uci get nextcloud.@nextcloud[0].image_name 2>/dev/null)
-}
-
-do_install() {
-  local config=`uci get nextcloud.@nextcloud[0].config_path 2>/dev/null`
-  local port=`uci get nextcloud.@nextcloud[0].port 2>/dev/null`
-  local IMAGE_NAME=`uci get nextcloud.@nextcloud[0].image_name 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)
+  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
@@ -37,91 +26,92 @@ do_install() {
   [ -z "$port" ] && port=8531
   [ -z "$IMAGE_NAME" ] && IMAGE_NAME=nextcloud:latest
 
+  rm -R /opt/docker2/compose/nextcloud-app
+  mkdir /opt/docker2/compose/nextcloud-app
 
-  # Create Docker Compose file with custom variables
+  touch /opt/docker2/compose/nextcloud-app/docker-compose.yml
-
+  cat > /opt/docker2/compose/nextcloud-app/docker-compose.yml <<EOF
-  # Create Docker Compose file with custom variables
+version: '3.7'
-touch docker-compose.yml
-cat > docker-compose.yml <<EOF
-version: '2'
-
-volumes:
-  nextcloud:
-  db:
-
 services:
-  db:
+  app:
-    image: mariadb:10.5
+    image: $IMAGE_NAME
     restart: always
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    ports:
+      - ${LAN_IP}:${port}:80
     volumes:
-      - db:/var/lib/mysql
+      - /opt/docker2/compose/nextcloud-app/data:/var/www/html
     environment:
-      - MYSQL_ROOT_PASSWORD=${GEN_PASS}
       - MYSQL_PASSWORD=${GEN_PASS}
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
+      - MYSQL_HOST=db
+    labels:
+      plugsy.name: "Nextcloud"
+      plugsy.category: "Home"
+      plugsy.link: "http://${LAN_IP}:${port}"
 
-  app:
+  db:
-    image: nextcloud
+    image: mariadb:10.5
     restart: always
-    ports:
-      - $port:80
-    links:
-      - db
     volumes:
-      - ./data:/var/www/html
+      - db:/var/lib/mysql
     environment:
+      - MYSQL_ROOT_PASSWORD=${GEN_PASS}
       - MYSQL_PASSWORD=${GEN_PASS}
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
-      - MYSQL_HOST=db
-    labels:
-      plugsy.name: "Nextcloud"
-      plugsy.category: "Home"
-      plugsy.icon: "@styled-icons/material-outlined/Cloud"
-      plugsy.link: "http://${LAN_IP}:$port"
 EOF
 
-  docker-compose up -d
+  docker-compose -f /opt/docker2/compose/nextcloud-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() {
   echo "usage: $0 sub-command"
   echo "where sub-command is one of:"
-  echo "      install                Install the nextcloud"
+  echo "      install                Install Nextcloud"
-  echo "      upgrade                Upgrade the nextcloud"
+  echo "      upgrade                Upgrade Nextcloud"
-  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart the nextcloud"
+  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart Nextcloud"
   echo "      status                 Nextcloud status"
   echo "      port                   Nextcloud port"
 }
 
 case ${ACTION} in
-  "install")
+  "install"|"upgrade")
-    do_install
+    get_image
-  ;;
+    do_install_detail
-  "upgrade")
-    do_install
   ;;
   "rm")
-    docker rm -f nextcloud
+    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} nextcloud
+    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=nextcloud' --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=nextcloud' --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