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

root/usr/libexec/apps/joplin/joplin.sh

@@ -4,22 +4,18 @@ ACTION=${1}
 shift 1
 
 get_image() {
-  IMAGE_NAME="florider89/joplin-server:latest"
+  IMAGE_NAME=$(uci get joplin.@joplin[0].image_name 2>/dev/null)
 }
 
 do_install_detail() {
-  local config=`uci get joplin.@joplin[0].config_path 2>/dev/null`
-  local port=`uci get joplin.@joplin[0].port 2>/dev/null`
-  local IMAGE_NAME=`uci get joplin.@joplin[0].image_name 2>/dev/null`
-
-  #Generate the generic environment variables for the docker-compose
+  local config=$(uci get joplin.@joplin[0].config_path 2>/dev/null)
+  local port=$(uci get joplin.@joplin[0].port 2>/dev/null)
+  local IMAGE_NAME=$(uci get joplin.@joplin[0].image_name 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
@@ -30,83 +26,81 @@ do_install_detail() {
   [ -z "$port" ] && port=22300
   [ -z "$IMAGE_NAME" ] && IMAGE_NAME=florider89/joplin-server:latest
 
+  rm -R /opt/docker2/compose/joplin-app
+  mkdir /opt/docker2/compose/joplin-app
 
-  # Create Docker Compose file with custom variables
-   
-  # Create Docker Compose file with custom variables
-touch docker-compose.yml
-cat > docker-compose.yml <<EOF
-version: '3'
+  touch /opt/docker2/compose/joplin-app/docker-compose.yml
+  cat > /opt/docker2/compose/joplin-app/docker-compose.yml <<EOF
+version: '3.7'
 services:
   app:
+    image: $IMAGE_NAME
+    restart: always
+    ports:
+      - ${LAN_IP}:${port}:22300
     environment:
-            - APP_BASE_URL=http://${LAN_IP}:${port}
-            - APP_PORT=${port}
       - POSTGRES_PASSWORD=${GEN_PASS}
-            - POSTGRES_DATABASE=joplin
-            - POSTGRES_USER=joplin
-            - POSTGRES_PORT=5432
-            - POSTGRES_HOST=db
-            - DB_CLIENT=pg
-        restart: unless-stopped
-        image: florider89/joplin-server:latest
-        ports:
-            - ${port}:22300
+    labels:
+      plugsy.name: "Joplin"
+      plugsy.category: "Productivity"
+      plugsy.link: "http://${LAN_IP}:${port}"
   db:
-        restart: unless-stopped
     image: postgres:13.1
-        ports:
-            - 5432:5432
-        volumes:
-            - ./data:/var/lib/postgresql/data
+    restart: always
     environment:
       - POSTGRES_PASSWORD=${GEN_PASS}
-            - POSTGRES_USER=joplin
-            - POSTGRES_DB=joplin
-
 EOF
 
-  docker-compose up -d
+  docker-compose -f /opt/docker2/compose/joplin-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 joplin"
-  echo "      upgrade                Upgrade joplin"
-  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart joplin"
-  echo "      status                 joplin status"
-  echo "      port                   joplin port"
+  echo "      install                Install Joplin"
+  echo "      upgrade                Upgrade Joplin"
+  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart Joplin"
+  echo "      status                 Joplin status"
+  echo "      port                   Joplin port"
 }
 
 case ${ACTION} in
-  "install")
-    get_image
-    do_install_detail
-  ;;
-  "upgrade")
+  "install"|"upgrade")
     get_image
     do_install_detail
   ;;
   "rm")
-    docker rm -f joplin
+    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} joplin
+    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=joplin' --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=joplin' --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