diff --git a/appstore/elastic-elasticsearch/8.19.13/.env b/appstore/elastic-elasticsearch/8.19.14/.env similarity index 100% rename from appstore/elastic-elasticsearch/8.19.13/.env rename to appstore/elastic-elasticsearch/8.19.14/.env diff --git a/appstore/elastic-elasticsearch/8.19.13/data.yml b/appstore/elastic-elasticsearch/8.19.14/data.yml similarity index 100% rename from appstore/elastic-elasticsearch/8.19.13/data.yml rename to appstore/elastic-elasticsearch/8.19.14/data.yml diff --git a/appstore/elastic-elasticsearch/8.19.13/docker-compose.yml b/appstore/elastic-elasticsearch/8.19.14/docker-compose.yml similarity index 96% rename from appstore/elastic-elasticsearch/8.19.13/docker-compose.yml rename to appstore/elastic-elasticsearch/8.19.14/docker-compose.yml index 3a8a4a0b4..e1be02545 100644 --- a/appstore/elastic-elasticsearch/8.19.13/docker-compose.yml +++ b/appstore/elastic-elasticsearch/8.19.14/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:8.19.13 + image: elasticsearch:8.19.14 labels: createdBy: Apps networks: diff --git a/appstore/elastic-elasticsearch/8.19.13/envs/default.env b/appstore/elastic-elasticsearch/8.19.14/envs/default.env similarity index 100% rename from appstore/elastic-elasticsearch/8.19.13/envs/default.env rename to appstore/elastic-elasticsearch/8.19.14/envs/default.env diff --git a/appstore/elastic-elasticsearch/8.19.13/envs/global.env b/appstore/elastic-elasticsearch/8.19.14/envs/global.env similarity index 100% rename from appstore/elastic-elasticsearch/8.19.13/envs/global.env rename to appstore/elastic-elasticsearch/8.19.14/envs/global.env diff --git a/appstore/elastic-elasticsearch/8.19.13/scripts/init.sh b/appstore/elastic-elasticsearch/8.19.14/scripts/init.sh similarity index 100% rename from appstore/elastic-elasticsearch/8.19.13/scripts/init.sh rename to appstore/elastic-elasticsearch/8.19.14/scripts/init.sh diff --git a/appstore/elastic-elasticsearch/8.19.13/scripts/uninstall.sh b/appstore/elastic-elasticsearch/8.19.14/scripts/uninstall.sh similarity index 100% rename from appstore/elastic-elasticsearch/8.19.13/scripts/uninstall.sh rename to appstore/elastic-elasticsearch/8.19.14/scripts/uninstall.sh diff --git a/appstore/elastic-elasticsearch/8.19.13/scripts/upgrade.sh b/appstore/elastic-elasticsearch/8.19.14/scripts/upgrade.sh similarity index 100% rename from appstore/elastic-elasticsearch/8.19.13/scripts/upgrade.sh rename to appstore/elastic-elasticsearch/8.19.14/scripts/upgrade.sh diff --git a/appstore/elastic-elasticsearch/9.3.2/.env b/appstore/elastic-elasticsearch/9.3.3/.env similarity index 100% rename from appstore/elastic-elasticsearch/9.3.2/.env rename to appstore/elastic-elasticsearch/9.3.3/.env diff --git a/appstore/elastic-elasticsearch/9.3.2/data.yml b/appstore/elastic-elasticsearch/9.3.3/data.yml similarity index 100% rename from appstore/elastic-elasticsearch/9.3.2/data.yml rename to appstore/elastic-elasticsearch/9.3.3/data.yml diff --git a/appstore/elastic-elasticsearch/9.3.2/docker-compose.yml b/appstore/elastic-elasticsearch/9.3.3/docker-compose.yml similarity index 96% rename from appstore/elastic-elasticsearch/9.3.2/docker-compose.yml rename to appstore/elastic-elasticsearch/9.3.3/docker-compose.yml index 87e0be687..611c73ce2 100644 --- a/appstore/elastic-elasticsearch/9.3.2/docker-compose.yml +++ b/appstore/elastic-elasticsearch/9.3.3/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:9.3.2 + image: elasticsearch:9.3.3 labels: createdBy: Apps networks: diff --git a/appstore/elastic-elasticsearch/9.3.2/envs/default.env b/appstore/elastic-elasticsearch/9.3.3/envs/default.env similarity index 100% rename from appstore/elastic-elasticsearch/9.3.2/envs/default.env rename to appstore/elastic-elasticsearch/9.3.3/envs/default.env diff --git a/appstore/elastic-elasticsearch/9.3.2/envs/global.env b/appstore/elastic-elasticsearch/9.3.3/envs/global.env similarity index 100% rename from appstore/elastic-elasticsearch/9.3.2/envs/global.env rename to appstore/elastic-elasticsearch/9.3.3/envs/global.env diff --git a/appstore/elastic-elasticsearch/9.3.2/scripts/init.sh b/appstore/elastic-elasticsearch/9.3.3/scripts/init.sh similarity index 100% rename from appstore/elastic-elasticsearch/9.3.2/scripts/init.sh rename to appstore/elastic-elasticsearch/9.3.3/scripts/init.sh diff --git a/appstore/elastic-elasticsearch/9.3.2/scripts/uninstall.sh b/appstore/elastic-elasticsearch/9.3.3/scripts/uninstall.sh similarity index 100% rename from appstore/elastic-elasticsearch/9.3.2/scripts/uninstall.sh rename to appstore/elastic-elasticsearch/9.3.3/scripts/uninstall.sh diff --git a/appstore/elastic-elasticsearch/9.3.2/scripts/upgrade.sh b/appstore/elastic-elasticsearch/9.3.3/scripts/upgrade.sh similarity index 100% rename from appstore/elastic-elasticsearch/9.3.2/scripts/upgrade.sh rename to appstore/elastic-elasticsearch/9.3.3/scripts/upgrade.sh diff --git a/appstore/lucky/2.27.2/2.20.2/.env b/appstore/lucky/2.27.2/2.20.2/.env deleted file mode 100644 index d7c306db0..000000000 --- a/appstore/lucky/2.27.2/2.20.2/.env +++ /dev/null @@ -1,9 +0,0 @@ -# 网络模式 [必填] -NETWORK_MODE=host - -# 数据持久化路径 [必填] -LUCKY_ROOT_PATH=/home/lucky - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=16601 - diff --git a/appstore/lucky/2.27.2/2.20.2/data.yml b/appstore/lucky/2.27.2/2.20.2/data.yml deleted file mode 100644 index 1b04ae46a..000000000 --- a/appstore/lucky/2.27.2/2.20.2/data.yml +++ /dev/null @@ -1,33 +0,0 @@ -additionalProperties: - formFields: - - default: "host" - edit: true - envKey: NETWORK_MODE - labelZh: 网络模式 - labelEn: Network mode - required: true - type: select - values: - - label: 主机网络模式 - value: "host" - - label: 桥接网络模式 - value: "bridge" - - label: 无网络模式 - value: "none" - - label: 1panel-network - value: "1panel-network" - - default: "/home/lucky" - edit: true - envKey: LUCKY_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 16601 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number diff --git a/appstore/lucky/2.27.2/2.20.2/docker-compose.yml b/appstore/lucky/2.27.2/2.20.2/docker-compose.yml deleted file mode 100644 index a9d859c87..000000000 --- a/appstore/lucky/2.27.2/2.20.2/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -networks: - 1panel-network: - external: true -services: - lucky: - container_name: 2.27.2 - entrypoint: - - /goodluck/start.sh - env_file: - - ./envs/global.env - - .env - environment: - - TZ=Asia/Shanghai - image: gdy666/lucky:2.27.2 - labels: - createdBy: Apps - network_mode: ${NETWORK_MODE:-host} - ports: - - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - restart: always - volumes: - - ./run/start.sh:/goodluck/start.sh:ro - - ${LUCKY_ROOT_PATH}/data:/goodluck diff --git a/appstore/lucky/2.27.2/2.20.2/run/start.sh b/appstore/lucky/2.27.2/2.20.2/run/start.sh deleted file mode 100644 index 57057d511..000000000 --- a/appstore/lucky/2.27.2/2.20.2/run/start.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -DEFAULT_PORT=16601 -PORT_FILE="/goodluck/port" -WAIT_SECONDS=30 - -if [ -f "$PORT_FILE" ]; then - DETECT_PORT=$(cat "$PORT_FILE") - echo "Loaded last port: ${DETECT_PORT}" -else - DETECT_PORT=$DEFAULT_PORT - echo "No previous port found, using default port: ${DETECT_PORT}" -fi - -/app/lucky -c /goodluck/lucky.conf -runInDocker & -MAIN_PID=$! - -echo "Lucky main started with PID $MAIN_PID" - -echo "Waiting for lucky to listen on port ${DETECT_PORT} (timeout ${WAIT_SECONDS}s)..." -SECONDS_WAITED=0 -while ! nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; do - sleep 1 - SECONDS_WAITED=$((SECONDS_WAITED + 1)) - - if [ "$SECONDS_WAITED" -ge "$WAIT_SECONDS" ]; then - echo "Timeout waiting for port ${DETECT_PORT}, continue startup..." - break - fi -done - -if nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; then - echo "Port ${DETECT_PORT} is up." -else - echo "Port ${DETECT_PORT} still not open, continuing anyway." -fi - -echo "Running: /app/lucky -rSetHttpAdminPort=${PANEL_APP_PORT_HTTP}" -/app/lucky -rSetHttpAdminPort="${PANEL_APP_PORT_HTTP}" - -echo "Running: /app/lucky -rSetHttpsAdminPort=${PANEL_APP_PORT_HTTP}" -/app/lucky -rSetHttpsAdminPort="${PANEL_APP_PORT_HTTP}" - -DIR=$(dirname "$PORT_FILE") -mkdir -p "$DIR" - -echo "${PANEL_APP_PORT_HTTP}" > "$PORT_FILE" -echo "Saved admin port ${PANEL_APP_PORT_HTTP} to ${PORT_FILE}" - -wait $MAIN_PID diff --git a/appstore/lucky/2.27.2/2.20.2/scripts/init.sh b/appstore/lucky/2.27.2/2.20.2/scripts/init.sh deleted file mode 100644 index 2dcbf3f8f..000000000 --- a/appstore/lucky/2.27.2/2.20.2/scripts/init.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - sed -i '/^GLOBAL_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - - # setup-2 update start.sh permission - chmod +x ./run/start.sh - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/lucky/2.27.2/2.20.2/scripts/upgrade.sh b/appstore/lucky/2.27.2/2.20.2/scripts/upgrade.sh deleted file mode 100644 index 2dcbf3f8f..000000000 --- a/appstore/lucky/2.27.2/2.20.2/scripts/upgrade.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - sed -i '/^GLOBAL_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - - # setup-2 update start.sh permission - chmod +x ./run/start.sh - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/neko-firefox/3.1.2/.env b/appstore/neko-firefox/3.1.3/.env similarity index 100% rename from appstore/neko-firefox/3.1.2/.env rename to appstore/neko-firefox/3.1.3/.env diff --git a/appstore/neko-firefox/3.1.2/data.yml b/appstore/neko-firefox/3.1.3/data.yml similarity index 100% rename from appstore/neko-firefox/3.1.2/data.yml rename to appstore/neko-firefox/3.1.3/data.yml diff --git a/appstore/neko-firefox/3.1.2/docker-compose.yml b/appstore/neko-firefox/3.1.3/docker-compose.yml similarity index 93% rename from appstore/neko-firefox/3.1.2/docker-compose.yml rename to appstore/neko-firefox/3.1.3/docker-compose.yml index fcd2f569a..9787404ad 100644 --- a/appstore/neko-firefox/3.1.2/docker-compose.yml +++ b/appstore/neko-firefox/3.1.3/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/firefox:3.1.2 + image: ghcr.io/m1k1o/neko/firefox:3.1.3 labels: createdBy: Apps networks: diff --git a/appstore/lucky/2.27.2/2.20.2/envs/default.env b/appstore/neko-firefox/3.1.3/envs/default.env similarity index 100% rename from appstore/lucky/2.27.2/2.20.2/envs/default.env rename to appstore/neko-firefox/3.1.3/envs/default.env diff --git a/appstore/lucky/2.27.2/2.20.2/envs/global.env b/appstore/neko-firefox/3.1.3/envs/global.env similarity index 100% rename from appstore/lucky/2.27.2/2.20.2/envs/global.env rename to appstore/neko-firefox/3.1.3/envs/global.env diff --git a/appstore/neko-firefox/3.1.2/scripts/init.sh b/appstore/neko-firefox/3.1.3/scripts/init.sh similarity index 100% rename from appstore/neko-firefox/3.1.2/scripts/init.sh rename to appstore/neko-firefox/3.1.3/scripts/init.sh diff --git a/appstore/lucky/2.27.2/2.20.2/scripts/uninstall.sh b/appstore/neko-firefox/3.1.3/scripts/uninstall.sh similarity index 100% rename from appstore/lucky/2.27.2/2.20.2/scripts/uninstall.sh rename to appstore/neko-firefox/3.1.3/scripts/uninstall.sh diff --git a/appstore/neko-firefox/3.1.2/scripts/upgrade.sh b/appstore/neko-firefox/3.1.3/scripts/upgrade.sh similarity index 100% rename from appstore/neko-firefox/3.1.2/scripts/upgrade.sh rename to appstore/neko-firefox/3.1.3/scripts/upgrade.sh diff --git a/appstore/neko-google-chrome/3.1.2/.env b/appstore/neko-google-chrome/3.1.3/.env similarity index 100% rename from appstore/neko-google-chrome/3.1.2/.env rename to appstore/neko-google-chrome/3.1.3/.env diff --git a/appstore/neko-google-chrome/3.1.2/data.yml b/appstore/neko-google-chrome/3.1.3/data.yml similarity index 100% rename from appstore/neko-google-chrome/3.1.2/data.yml rename to appstore/neko-google-chrome/3.1.3/data.yml diff --git a/appstore/neko-google-chrome/3.1.2/docker-compose.yml b/appstore/neko-google-chrome/3.1.3/docker-compose.yml similarity index 92% rename from appstore/neko-google-chrome/3.1.2/docker-compose.yml rename to appstore/neko-google-chrome/3.1.3/docker-compose.yml index 1c8924e83..737dbb9ce 100644 --- a/appstore/neko-google-chrome/3.1.2/docker-compose.yml +++ b/appstore/neko-google-chrome/3.1.3/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/google-chrome:3.1.2 + image: ghcr.io/m1k1o/neko/google-chrome:3.1.3 labels: createdBy: Apps networks: diff --git a/appstore/neko-firefox/3.1.2/envs/default.env b/appstore/neko-google-chrome/3.1.3/envs/default.env similarity index 100% rename from appstore/neko-firefox/3.1.2/envs/default.env rename to appstore/neko-google-chrome/3.1.3/envs/default.env diff --git a/appstore/neko-firefox/3.1.2/envs/global.env b/appstore/neko-google-chrome/3.1.3/envs/global.env similarity index 100% rename from appstore/neko-firefox/3.1.2/envs/global.env rename to appstore/neko-google-chrome/3.1.3/envs/global.env diff --git a/appstore/neko-google-chrome/3.1.2/scripts/init.sh b/appstore/neko-google-chrome/3.1.3/scripts/init.sh similarity index 100% rename from appstore/neko-google-chrome/3.1.2/scripts/init.sh rename to appstore/neko-google-chrome/3.1.3/scripts/init.sh diff --git a/appstore/neko-firefox/3.1.2/scripts/uninstall.sh b/appstore/neko-google-chrome/3.1.3/scripts/uninstall.sh similarity index 100% rename from appstore/neko-firefox/3.1.2/scripts/uninstall.sh rename to appstore/neko-google-chrome/3.1.3/scripts/uninstall.sh diff --git a/appstore/neko-google-chrome/3.1.2/scripts/upgrade.sh b/appstore/neko-google-chrome/3.1.3/scripts/upgrade.sh similarity index 100% rename from appstore/neko-google-chrome/3.1.2/scripts/upgrade.sh rename to appstore/neko-google-chrome/3.1.3/scripts/upgrade.sh diff --git a/appstore/neko-kde/3.1.2/.env b/appstore/neko-kde/3.1.3/.env similarity index 100% rename from appstore/neko-kde/3.1.2/.env rename to appstore/neko-kde/3.1.3/.env diff --git a/appstore/neko-kde/3.1.2/data.yml b/appstore/neko-kde/3.1.3/data.yml similarity index 100% rename from appstore/neko-kde/3.1.2/data.yml rename to appstore/neko-kde/3.1.3/data.yml diff --git a/appstore/neko-kde/3.1.2/docker-compose.yml b/appstore/neko-kde/3.1.3/docker-compose.yml similarity index 94% rename from appstore/neko-kde/3.1.2/docker-compose.yml rename to appstore/neko-kde/3.1.3/docker-compose.yml index f90a13d7a..7856d9d78 100644 --- a/appstore/neko-kde/3.1.2/docker-compose.yml +++ b/appstore/neko-kde/3.1.3/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/kde:3.1.2 + image: ghcr.io/m1k1o/neko/kde:3.1.3 labels: createdBy: Apps networks: diff --git a/appstore/neko-google-chrome/3.1.2/envs/default.env b/appstore/neko-kde/3.1.3/envs/default.env similarity index 100% rename from appstore/neko-google-chrome/3.1.2/envs/default.env rename to appstore/neko-kde/3.1.3/envs/default.env diff --git a/appstore/neko-google-chrome/3.1.2/envs/global.env b/appstore/neko-kde/3.1.3/envs/global.env similarity index 100% rename from appstore/neko-google-chrome/3.1.2/envs/global.env rename to appstore/neko-kde/3.1.3/envs/global.env diff --git a/appstore/neko-kde/3.1.2/scripts/init.sh b/appstore/neko-kde/3.1.3/scripts/init.sh similarity index 100% rename from appstore/neko-kde/3.1.2/scripts/init.sh rename to appstore/neko-kde/3.1.3/scripts/init.sh diff --git a/appstore/neko-google-chrome/3.1.2/scripts/uninstall.sh b/appstore/neko-kde/3.1.3/scripts/uninstall.sh similarity index 100% rename from appstore/neko-google-chrome/3.1.2/scripts/uninstall.sh rename to appstore/neko-kde/3.1.3/scripts/uninstall.sh diff --git a/appstore/neko-kde/3.1.2/scripts/upgrade.sh b/appstore/neko-kde/3.1.3/scripts/upgrade.sh similarity index 100% rename from appstore/neko-kde/3.1.2/scripts/upgrade.sh rename to appstore/neko-kde/3.1.3/scripts/upgrade.sh diff --git a/appstore/neko-microsoft-edge/3.1.2/.env b/appstore/neko-microsoft-edge/3.1.3/.env similarity index 100% rename from appstore/neko-microsoft-edge/3.1.2/.env rename to appstore/neko-microsoft-edge/3.1.3/.env diff --git a/appstore/neko-microsoft-edge/3.1.2/data.yml b/appstore/neko-microsoft-edge/3.1.3/data.yml similarity index 100% rename from appstore/neko-microsoft-edge/3.1.2/data.yml rename to appstore/neko-microsoft-edge/3.1.3/data.yml diff --git a/appstore/neko-microsoft-edge/3.1.2/docker-compose.yml b/appstore/neko-microsoft-edge/3.1.3/docker-compose.yml similarity index 92% rename from appstore/neko-microsoft-edge/3.1.2/docker-compose.yml rename to appstore/neko-microsoft-edge/3.1.3/docker-compose.yml index 7343a3c39..16b41fda7 100644 --- a/appstore/neko-microsoft-edge/3.1.2/docker-compose.yml +++ b/appstore/neko-microsoft-edge/3.1.3/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/microsoft-edge:3.1.2 + image: ghcr.io/m1k1o/neko/microsoft-edge:3.1.3 labels: createdBy: Apps networks: diff --git a/appstore/neko-kde/3.1.2/envs/default.env b/appstore/neko-microsoft-edge/3.1.3/envs/default.env similarity index 100% rename from appstore/neko-kde/3.1.2/envs/default.env rename to appstore/neko-microsoft-edge/3.1.3/envs/default.env diff --git a/appstore/neko-kde/3.1.2/envs/global.env b/appstore/neko-microsoft-edge/3.1.3/envs/global.env similarity index 100% rename from appstore/neko-kde/3.1.2/envs/global.env rename to appstore/neko-microsoft-edge/3.1.3/envs/global.env diff --git a/appstore/neko-microsoft-edge/3.1.2/scripts/init.sh b/appstore/neko-microsoft-edge/3.1.3/scripts/init.sh similarity index 100% rename from appstore/neko-microsoft-edge/3.1.2/scripts/init.sh rename to appstore/neko-microsoft-edge/3.1.3/scripts/init.sh diff --git a/appstore/neko-kde/3.1.2/scripts/uninstall.sh b/appstore/neko-microsoft-edge/3.1.3/scripts/uninstall.sh similarity index 100% rename from appstore/neko-kde/3.1.2/scripts/uninstall.sh rename to appstore/neko-microsoft-edge/3.1.3/scripts/uninstall.sh diff --git a/appstore/neko-microsoft-edge/3.1.2/scripts/upgrade.sh b/appstore/neko-microsoft-edge/3.1.3/scripts/upgrade.sh similarity index 100% rename from appstore/neko-microsoft-edge/3.1.2/scripts/upgrade.sh rename to appstore/neko-microsoft-edge/3.1.3/scripts/upgrade.sh diff --git a/appstore/neko-remmina/3.1.2/.env b/appstore/neko-remmina/3.1.3/.env similarity index 100% rename from appstore/neko-remmina/3.1.2/.env rename to appstore/neko-remmina/3.1.3/.env diff --git a/appstore/neko-remmina/3.1.2/data.yml b/appstore/neko-remmina/3.1.3/data.yml similarity index 100% rename from appstore/neko-remmina/3.1.2/data.yml rename to appstore/neko-remmina/3.1.3/data.yml diff --git a/appstore/neko-remmina/3.1.2/docker-compose.yml b/appstore/neko-remmina/3.1.3/docker-compose.yml similarity index 93% rename from appstore/neko-remmina/3.1.2/docker-compose.yml rename to appstore/neko-remmina/3.1.3/docker-compose.yml index 8b2020983..ddebae64e 100644 --- a/appstore/neko-remmina/3.1.2/docker-compose.yml +++ b/appstore/neko-remmina/3.1.3/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/remmina:3.1.2 + image: ghcr.io/m1k1o/neko/remmina:3.1.3 labels: createdBy: Apps networks: diff --git a/appstore/neko-microsoft-edge/3.1.2/envs/default.env b/appstore/neko-remmina/3.1.3/envs/default.env similarity index 100% rename from appstore/neko-microsoft-edge/3.1.2/envs/default.env rename to appstore/neko-remmina/3.1.3/envs/default.env diff --git a/appstore/neko-microsoft-edge/3.1.2/envs/global.env b/appstore/neko-remmina/3.1.3/envs/global.env similarity index 100% rename from appstore/neko-microsoft-edge/3.1.2/envs/global.env rename to appstore/neko-remmina/3.1.3/envs/global.env diff --git a/appstore/neko-remmina/3.1.2/scripts/init.sh b/appstore/neko-remmina/3.1.3/scripts/init.sh similarity index 100% rename from appstore/neko-remmina/3.1.2/scripts/init.sh rename to appstore/neko-remmina/3.1.3/scripts/init.sh diff --git a/appstore/neko-microsoft-edge/3.1.2/scripts/uninstall.sh b/appstore/neko-remmina/3.1.3/scripts/uninstall.sh similarity index 100% rename from appstore/neko-microsoft-edge/3.1.2/scripts/uninstall.sh rename to appstore/neko-remmina/3.1.3/scripts/uninstall.sh diff --git a/appstore/neko-remmina/3.1.2/scripts/upgrade.sh b/appstore/neko-remmina/3.1.3/scripts/upgrade.sh similarity index 100% rename from appstore/neko-remmina/3.1.2/scripts/upgrade.sh rename to appstore/neko-remmina/3.1.3/scripts/upgrade.sh diff --git a/appstore/neko-tor-browser/3.1.2/scripts/uninstall.sh b/appstore/neko-tor-browser/3.1.2/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/appstore/neko-tor-browser/3.1.2/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/appstore/neko-tor-browser/3.1.2/.env b/appstore/neko-tor-browser/3.1.3/.env similarity index 100% rename from appstore/neko-tor-browser/3.1.2/.env rename to appstore/neko-tor-browser/3.1.3/.env diff --git a/appstore/neko-tor-browser/3.1.2/data.yml b/appstore/neko-tor-browser/3.1.3/data.yml similarity index 100% rename from appstore/neko-tor-browser/3.1.2/data.yml rename to appstore/neko-tor-browser/3.1.3/data.yml diff --git a/appstore/neko-tor-browser/3.1.2/docker-compose.yml b/appstore/neko-tor-browser/3.1.3/docker-compose.yml similarity index 93% rename from appstore/neko-tor-browser/3.1.2/docker-compose.yml rename to appstore/neko-tor-browser/3.1.3/docker-compose.yml index ee7465dd9..167d800d8 100644 --- a/appstore/neko-tor-browser/3.1.2/docker-compose.yml +++ b/appstore/neko-tor-browser/3.1.3/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/tor-browser:3.1.2 + image: ghcr.io/m1k1o/neko/tor-browser:3.1.3 labels: createdBy: Apps networks: diff --git a/appstore/neko-remmina/3.1.2/envs/default.env b/appstore/neko-tor-browser/3.1.3/envs/default.env similarity index 100% rename from appstore/neko-remmina/3.1.2/envs/default.env rename to appstore/neko-tor-browser/3.1.3/envs/default.env diff --git a/appstore/neko-remmina/3.1.2/envs/global.env b/appstore/neko-tor-browser/3.1.3/envs/global.env similarity index 100% rename from appstore/neko-remmina/3.1.2/envs/global.env rename to appstore/neko-tor-browser/3.1.3/envs/global.env diff --git a/appstore/neko-tor-browser/3.1.2/scripts/init.sh b/appstore/neko-tor-browser/3.1.3/scripts/init.sh similarity index 100% rename from appstore/neko-tor-browser/3.1.2/scripts/init.sh rename to appstore/neko-tor-browser/3.1.3/scripts/init.sh diff --git a/appstore/neko-remmina/3.1.2/scripts/uninstall.sh b/appstore/neko-tor-browser/3.1.3/scripts/uninstall.sh similarity index 100% rename from appstore/neko-remmina/3.1.2/scripts/uninstall.sh rename to appstore/neko-tor-browser/3.1.3/scripts/uninstall.sh diff --git a/appstore/neko-tor-browser/3.1.2/scripts/upgrade.sh b/appstore/neko-tor-browser/3.1.3/scripts/upgrade.sh similarity index 100% rename from appstore/neko-tor-browser/3.1.2/scripts/upgrade.sh rename to appstore/neko-tor-browser/3.1.3/scripts/upgrade.sh diff --git a/dockge/2.27.2/.env b/dockge/2.27.2/.env deleted file mode 100644 index d7c306db0..000000000 --- a/dockge/2.27.2/.env +++ /dev/null @@ -1,9 +0,0 @@ -# 网络模式 [必填] -NETWORK_MODE=host - -# 数据持久化路径 [必填] -LUCKY_ROOT_PATH=/home/lucky - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=16601 - diff --git a/dockge/2.27.2/docker-compose.yml b/dockge/2.27.2/docker-compose.yml deleted file mode 100644 index a9d859c87..000000000 --- a/dockge/2.27.2/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -networks: - 1panel-network: - external: true -services: - lucky: - container_name: 2.27.2 - entrypoint: - - /goodluck/start.sh - env_file: - - ./envs/global.env - - .env - environment: - - TZ=Asia/Shanghai - image: gdy666/lucky:2.27.2 - labels: - createdBy: Apps - network_mode: ${NETWORK_MODE:-host} - ports: - - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - restart: always - volumes: - - ./run/start.sh:/goodluck/start.sh:ro - - ${LUCKY_ROOT_PATH}/data:/goodluck diff --git a/dockge/2.27.2/envs/default.env b/dockge/2.27.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/dockge/2.27.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/dockge/2.27.2/envs/global.env b/dockge/2.27.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/dockge/2.27.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/dockge/2.27.2/run/start.sh b/dockge/2.27.2/run/start.sh deleted file mode 100644 index 57057d511..000000000 --- a/dockge/2.27.2/run/start.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -DEFAULT_PORT=16601 -PORT_FILE="/goodluck/port" -WAIT_SECONDS=30 - -if [ -f "$PORT_FILE" ]; then - DETECT_PORT=$(cat "$PORT_FILE") - echo "Loaded last port: ${DETECT_PORT}" -else - DETECT_PORT=$DEFAULT_PORT - echo "No previous port found, using default port: ${DETECT_PORT}" -fi - -/app/lucky -c /goodluck/lucky.conf -runInDocker & -MAIN_PID=$! - -echo "Lucky main started with PID $MAIN_PID" - -echo "Waiting for lucky to listen on port ${DETECT_PORT} (timeout ${WAIT_SECONDS}s)..." -SECONDS_WAITED=0 -while ! nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; do - sleep 1 - SECONDS_WAITED=$((SECONDS_WAITED + 1)) - - if [ "$SECONDS_WAITED" -ge "$WAIT_SECONDS" ]; then - echo "Timeout waiting for port ${DETECT_PORT}, continue startup..." - break - fi -done - -if nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; then - echo "Port ${DETECT_PORT} is up." -else - echo "Port ${DETECT_PORT} still not open, continuing anyway." -fi - -echo "Running: /app/lucky -rSetHttpAdminPort=${PANEL_APP_PORT_HTTP}" -/app/lucky -rSetHttpAdminPort="${PANEL_APP_PORT_HTTP}" - -echo "Running: /app/lucky -rSetHttpsAdminPort=${PANEL_APP_PORT_HTTP}" -/app/lucky -rSetHttpsAdminPort="${PANEL_APP_PORT_HTTP}" - -DIR=$(dirname "$PORT_FILE") -mkdir -p "$DIR" - -echo "${PANEL_APP_PORT_HTTP}" > "$PORT_FILE" -echo "Saved admin port ${PANEL_APP_PORT_HTTP} to ${PORT_FILE}" - -wait $MAIN_PID diff --git a/dockge/elastic-elasticsearch/docker-compose.yml b/dockge/elastic-elasticsearch/docker-compose.yml index 3a8a4a0b4..611c73ce2 100644 --- a/dockge/elastic-elasticsearch/docker-compose.yml +++ b/dockge/elastic-elasticsearch/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:8.19.13 + image: elasticsearch:9.3.3 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_3_2/.env b/dockge/elastic-elasticsearch_8_19_14/.env similarity index 100% rename from dockge/elastic-elasticsearch_9_3_2/.env rename to dockge/elastic-elasticsearch_8_19_14/.env diff --git a/dockge/elastic-elasticsearch_9_3_2/docker-compose.yml b/dockge/elastic-elasticsearch_8_19_14/docker-compose.yml similarity index 96% rename from dockge/elastic-elasticsearch_9_3_2/docker-compose.yml rename to dockge/elastic-elasticsearch_8_19_14/docker-compose.yml index 87e0be687..e1be02545 100644 --- a/dockge/elastic-elasticsearch_9_3_2/docker-compose.yml +++ b/dockge/elastic-elasticsearch_8_19_14/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:9.3.2 + image: elasticsearch:8.19.14 labels: createdBy: Apps networks: diff --git a/appstore/neko-tor-browser/3.1.2/envs/default.env b/dockge/elastic-elasticsearch_8_19_14/envs/default.env similarity index 100% rename from appstore/neko-tor-browser/3.1.2/envs/default.env rename to dockge/elastic-elasticsearch_8_19_14/envs/default.env diff --git a/appstore/neko-tor-browser/3.1.2/envs/global.env b/dockge/elastic-elasticsearch_8_19_14/envs/global.env similarity index 100% rename from appstore/neko-tor-browser/3.1.2/envs/global.env rename to dockge/elastic-elasticsearch_8_19_14/envs/global.env diff --git a/dockge/elastic-elasticsearch_9_3_2/envs/default.env b/dockge/elastic-elasticsearch_9_3_2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/dockge/elastic-elasticsearch_9_3_2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/dockge/elastic-elasticsearch_9_3_2/envs/global.env b/dockge/elastic-elasticsearch_9_3_2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/dockge/elastic-elasticsearch_9_3_2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/dockge/lucky/2.20.2/docker-compose.yml b/dockge/lucky/2.20.2/docker-compose.yml deleted file mode 100644 index 14a5c9229..000000000 --- a/dockge/lucky/2.20.2/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - lucky: - image: gdy666/lucky:2.27.2 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - network_mode: ${NETWORK_MODE:-host} - ports: - - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - volumes: - - ./run/start.sh:/goodluck/start.sh:ro - - ${LUCKY_ROOT_PATH}/data:/goodluck - environment: - - TZ=Asia/Shanghai - entrypoint: [ "/goodluck/start.sh" ] diff --git a/dockge/lucky/2.20.2/envs/default.env b/dockge/lucky/2.20.2/envs/default.env deleted file mode 100644 index cd05f46e6..000000000 --- a/dockge/lucky/2.20.2/envs/default.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -ENV_FILE=.env diff --git a/dockge/lucky/2.20.2/envs/global.env b/dockge/lucky/2.20.2/envs/global.env deleted file mode 100644 index e10989fe4..000000000 --- a/dockge/lucky/2.20.2/envs/global.env +++ /dev/null @@ -1,2 +0,0 @@ -# copyright© 2024 XinJiang Ms Studio -TZ=Asia/Shanghai diff --git a/dockge/lucky/2.20.2/run/start.sh b/dockge/lucky/2.20.2/run/start.sh deleted file mode 100644 index 57057d511..000000000 --- a/dockge/lucky/2.20.2/run/start.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -DEFAULT_PORT=16601 -PORT_FILE="/goodluck/port" -WAIT_SECONDS=30 - -if [ -f "$PORT_FILE" ]; then - DETECT_PORT=$(cat "$PORT_FILE") - echo "Loaded last port: ${DETECT_PORT}" -else - DETECT_PORT=$DEFAULT_PORT - echo "No previous port found, using default port: ${DETECT_PORT}" -fi - -/app/lucky -c /goodluck/lucky.conf -runInDocker & -MAIN_PID=$! - -echo "Lucky main started with PID $MAIN_PID" - -echo "Waiting for lucky to listen on port ${DETECT_PORT} (timeout ${WAIT_SECONDS}s)..." -SECONDS_WAITED=0 -while ! nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; do - sleep 1 - SECONDS_WAITED=$((SECONDS_WAITED + 1)) - - if [ "$SECONDS_WAITED" -ge "$WAIT_SECONDS" ]; then - echo "Timeout waiting for port ${DETECT_PORT}, continue startup..." - break - fi -done - -if nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; then - echo "Port ${DETECT_PORT} is up." -else - echo "Port ${DETECT_PORT} still not open, continuing anyway." -fi - -echo "Running: /app/lucky -rSetHttpAdminPort=${PANEL_APP_PORT_HTTP}" -/app/lucky -rSetHttpAdminPort="${PANEL_APP_PORT_HTTP}" - -echo "Running: /app/lucky -rSetHttpsAdminPort=${PANEL_APP_PORT_HTTP}" -/app/lucky -rSetHttpsAdminPort="${PANEL_APP_PORT_HTTP}" - -DIR=$(dirname "$PORT_FILE") -mkdir -p "$DIR" - -echo "${PANEL_APP_PORT_HTTP}" > "$PORT_FILE" -echo "Saved admin port ${PANEL_APP_PORT_HTTP} to ${PORT_FILE}" - -wait $MAIN_PID diff --git a/dockge/neko-firefox/docker-compose.yml b/dockge/neko-firefox/docker-compose.yml index fcd2f569a..9787404ad 100644 --- a/dockge/neko-firefox/docker-compose.yml +++ b/dockge/neko-firefox/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/firefox:3.1.2 + image: ghcr.io/m1k1o/neko/firefox:3.1.3 labels: createdBy: Apps networks: diff --git a/dockge/neko-google-chrome/docker-compose.yml b/dockge/neko-google-chrome/docker-compose.yml index 1c8924e83..737dbb9ce 100644 --- a/dockge/neko-google-chrome/docker-compose.yml +++ b/dockge/neko-google-chrome/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/google-chrome:3.1.2 + image: ghcr.io/m1k1o/neko/google-chrome:3.1.3 labels: createdBy: Apps networks: diff --git a/dockge/neko-kde/docker-compose.yml b/dockge/neko-kde/docker-compose.yml index f90a13d7a..7856d9d78 100644 --- a/dockge/neko-kde/docker-compose.yml +++ b/dockge/neko-kde/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/kde:3.1.2 + image: ghcr.io/m1k1o/neko/kde:3.1.3 labels: createdBy: Apps networks: diff --git a/dockge/neko-microsoft-edge/docker-compose.yml b/dockge/neko-microsoft-edge/docker-compose.yml index 7343a3c39..16b41fda7 100644 --- a/dockge/neko-microsoft-edge/docker-compose.yml +++ b/dockge/neko-microsoft-edge/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/microsoft-edge:3.1.2 + image: ghcr.io/m1k1o/neko/microsoft-edge:3.1.3 labels: createdBy: Apps networks: diff --git a/dockge/neko-remmina/docker-compose.yml b/dockge/neko-remmina/docker-compose.yml index 8b2020983..ddebae64e 100644 --- a/dockge/neko-remmina/docker-compose.yml +++ b/dockge/neko-remmina/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/remmina:3.1.2 + image: ghcr.io/m1k1o/neko/remmina:3.1.3 labels: createdBy: Apps networks: diff --git a/dockge/neko-tor-browser/docker-compose.yml b/dockge/neko-tor-browser/docker-compose.yml index ee7465dd9..167d800d8 100644 --- a/dockge/neko-tor-browser/docker-compose.yml +++ b/dockge/neko-tor-browser/docker-compose.yml @@ -14,7 +14,7 @@ services: - NEKO_WEBRTC_EPR=${PANEL_APP_PORT_WEBRTC_EPR} - NEKO_WEBRTC_ICELITE=1 - NEKO_WEBRTC_IP_RETRIEVAL_URL=https://ifconfig.co/ip - image: ghcr.io/m1k1o/neko/tor-browser:3.1.2 + image: ghcr.io/m1k1o/neko/tor-browser:3.1.3 labels: createdBy: Apps networks: