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

root/usr/libexec/apps/gitea/gitea.sh

@@ -4,24 +4,18 @@ ACTION=${1}
 shift 1
 
 get_image() {
-  IMAGE_NAME="gitea/gitea:1.17.1"
+  IMAGE_NAME=$(uci get gitea.@gitea[0].image_name 2>/dev/null)
 }
 
 do_install_detail() {
-  local config=`uci get gitea.@gitea[0].config_path 2>/dev/null`
+  local config=$(uci get gitea.@gitea[0].config_path 2>/dev/null)
-  local port=`uci get gitea.@gitea[0].port 2>/dev/null`
+  local port=$(uci get gitea.@gitea[0].port 2>/dev/null)
-  local IMAGE_NAME=`uci get gitea.@gitea[0].image_name 2>/dev/null`
+  local IMAGE_NAME=$(uci get gitea.@gitea[0].image_name 2>/dev/null)
-  local username=`uci get gitea.@gitea[0].username 2>/dev/null`
-  local password=`uci get gitea.@gitea[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
@@ -32,25 +26,19 @@ do_install_detail() {
   [ -z "$port" ] && port=3000
   [ -z "$IMAGE_NAME" ] && IMAGE_NAME=gitea/gitea:1.17.1
 
+  rm -R /opt/docker2/compose/gitea-app
+  mkdir /opt/docker2/compose/gitea-app
 
-  # Create Docker Compose file with custom variables
+  touch /opt/docker2/compose/gitea-app/docker-compose.yml
-   
+  cat > /opt/docker2/compose/gitea-app/docker-compose.yml <<EOF
-  # Create Docker Compose file with custom variables
-touch docker-compose.yml
-cat > docker-compose.yml <<EOF
 version: "3"
-
 networks:
   gitea:
     external: false
-
 services:
   server:
     image: $IMAGE_NAME
     container_name: gitea
-    environment:
-      - USER_UID=1000
-      - USER_GID=1000
     restart: always
     networks:
       - gitea
@@ -64,51 +52,59 @@ services:
     labels:
       plugsy.name: "Gitea"
       plugsy.category: "Home"
-      plugsy.icon: "@styled-icons/boxicons-logos/Gitea"
+      plugsy.link: "http://${LAN_IP}:$port"
-      plugsy.link: "http://${LAN_IP}:3000"
 EOF
 
-  docker-compose up -d
+  docker-compose -f /opt/docker2/compose/gitea-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 gitea"
+  echo "      install                Install Gitea"
-  echo "      upgrade                Upgrade gitea"
+  echo "      upgrade                Upgrade Gitea"
-  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart gitea"
+  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart Gitea"
-  echo "      status                 gitea status"
+  echo "      status                 Gitea status"
-  echo "      port                   gitea port"
+  echo "      port                   Gitea port"
 }
 
 case ${ACTION} in
-  "install")
+  "install"|"upgrade")
-    get_image
-    do_install_detail
-  ;;
-  "upgrade")
     get_image
     do_install_detail
   ;;
   "rm")
-    docker rm -f gitea
+    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} gitea
+    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=gitea' --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=gitea' --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