From 1c6cfa45eb12a423876b8b493ec942b61c883133 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Tue, 9 Dec 2025 03:04:42 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- appstore/ghost/{6.10.0 => 6.10.1}/.env | 0 appstore/ghost/{6.10.0 => 6.10.1}/data.yml | 0 .../{6.10.0 => 6.10.1}/docker-compose.yml | 2 +- .../ghost/{6.10.0 => 6.10.1}/envs/default.env | 0 .../ghost/{6.10.0 => 6.10.1}/envs/global.env | 0 .../ghost/{6.10.0 => 6.10.1}/scripts/init.sh | 0 .../{6.10.0 => 6.10.1}/scripts/uninstall.sh | 0 .../{6.10.0 => 6.10.1}/scripts/upgrade.sh | 0 appstore/lucky/2.20.2/docker-compose.yml | 3 +++ appstore/lucky/2.20.2/run/start.sh | 22 +++++++++++++++++++ appstore/lucky/2.20.2/scripts/init.sh | 3 +++ appstore/lucky/2.20.2/scripts/upgrade.sh | 3 +++ appstore/lucky/README.md | 16 ++++++++++++++ dockge/ghost/docker-compose.yml | 2 +- dockge/lucky/docker-compose.yml | 3 +++ dockge/lucky/run/start.sh | 22 +++++++++++++++++++ 16 files changed, 74 insertions(+), 2 deletions(-) rename appstore/ghost/{6.10.0 => 6.10.1}/.env (100%) rename appstore/ghost/{6.10.0 => 6.10.1}/data.yml (100%) rename appstore/ghost/{6.10.0 => 6.10.1}/docker-compose.yml (95%) rename appstore/ghost/{6.10.0 => 6.10.1}/envs/default.env (100%) rename appstore/ghost/{6.10.0 => 6.10.1}/envs/global.env (100%) rename appstore/ghost/{6.10.0 => 6.10.1}/scripts/init.sh (100%) rename appstore/ghost/{6.10.0 => 6.10.1}/scripts/uninstall.sh (100%) rename appstore/ghost/{6.10.0 => 6.10.1}/scripts/upgrade.sh (100%) create mode 100644 appstore/lucky/2.20.2/run/start.sh create mode 100644 dockge/lucky/run/start.sh diff --git a/appstore/ghost/6.10.0/.env b/appstore/ghost/6.10.1/.env similarity index 100% rename from appstore/ghost/6.10.0/.env rename to appstore/ghost/6.10.1/.env diff --git a/appstore/ghost/6.10.0/data.yml b/appstore/ghost/6.10.1/data.yml similarity index 100% rename from appstore/ghost/6.10.0/data.yml rename to appstore/ghost/6.10.1/data.yml diff --git a/appstore/ghost/6.10.0/docker-compose.yml b/appstore/ghost/6.10.1/docker-compose.yml similarity index 95% rename from appstore/ghost/6.10.0/docker-compose.yml rename to appstore/ghost/6.10.1/docker-compose.yml index 2db07cf99..b74d71429 100644 --- a/appstore/ghost/6.10.0/docker-compose.yml +++ b/appstore/ghost/6.10.1/docker-compose.yml @@ -14,7 +14,7 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true - image: ghost:6.10.0 + image: ghost:6.10.1 labels: createdBy: Apps networks: diff --git a/appstore/ghost/6.10.0/envs/default.env b/appstore/ghost/6.10.1/envs/default.env similarity index 100% rename from appstore/ghost/6.10.0/envs/default.env rename to appstore/ghost/6.10.1/envs/default.env diff --git a/appstore/ghost/6.10.0/envs/global.env b/appstore/ghost/6.10.1/envs/global.env similarity index 100% rename from appstore/ghost/6.10.0/envs/global.env rename to appstore/ghost/6.10.1/envs/global.env diff --git a/appstore/ghost/6.10.0/scripts/init.sh b/appstore/ghost/6.10.1/scripts/init.sh similarity index 100% rename from appstore/ghost/6.10.0/scripts/init.sh rename to appstore/ghost/6.10.1/scripts/init.sh diff --git a/appstore/ghost/6.10.0/scripts/uninstall.sh b/appstore/ghost/6.10.1/scripts/uninstall.sh similarity index 100% rename from appstore/ghost/6.10.0/scripts/uninstall.sh rename to appstore/ghost/6.10.1/scripts/uninstall.sh diff --git a/appstore/ghost/6.10.0/scripts/upgrade.sh b/appstore/ghost/6.10.1/scripts/upgrade.sh similarity index 100% rename from appstore/ghost/6.10.0/scripts/upgrade.sh rename to appstore/ghost/6.10.1/scripts/upgrade.sh diff --git a/appstore/lucky/2.20.2/docker-compose.yml b/appstore/lucky/2.20.2/docker-compose.yml index e15a20a89..6fefca0bd 100644 --- a/appstore/lucky/2.20.2/docker-compose.yml +++ b/appstore/lucky/2.20.2/docker-compose.yml @@ -4,6 +4,8 @@ networks: services: lucky: container_name: lucky + entrypoint: + - /goodluck/start.sh env_file: - ./envs/global.env - .env @@ -17,4 +19,5 @@ services: - ${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.20.2/run/start.sh b/appstore/lucky/2.20.2/run/start.sh new file mode 100644 index 000000000..b38671f33 --- /dev/null +++ b/appstore/lucky/2.20.2/run/start.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +PORT=16601 + +/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 ${PORT}..." +while ! nc -z 127.0.0.1 "${PORT}" 2>/dev/null; do + sleep 1 +done + +echo "Lucky port ${PORT} is up" + +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}" + +wait $MAIN_PID diff --git a/appstore/lucky/2.20.2/scripts/init.sh b/appstore/lucky/2.20.2/scripts/init.sh index 07fb8c3fe..2dcbf3f8f 100644 --- a/appstore/lucky/2.20.2/scripts/init.sh +++ b/appstore/lucky/2.20.2/scripts/init.sh @@ -10,6 +10,9 @@ if [ -f .env ]; then 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 diff --git a/appstore/lucky/2.20.2/scripts/upgrade.sh b/appstore/lucky/2.20.2/scripts/upgrade.sh index 07fb8c3fe..2dcbf3f8f 100644 --- a/appstore/lucky/2.20.2/scripts/upgrade.sh +++ b/appstore/lucky/2.20.2/scripts/upgrade.sh @@ -10,6 +10,9 @@ if [ -f .env ]; then 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 diff --git a/appstore/lucky/README.md b/appstore/lucky/README.md index 8d7532978..babd277c6 100644 --- a/appstore/lucky/README.md +++ b/appstore/lucky/README.md @@ -6,6 +6,22 @@ ![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) +## 安装说明 + +> 默认账号：`666` +> +> 默认密码：`666` + +安装成功后，必须立即完成以下操作(长时间未能操作，需要删除持久化目录后重新安装，否则无法访问后台页面)： + +### 1. 马上修改你的用户名和密码 + +### 2. 必须设置你的Lucky后台安全入口 + +### 3. 请开启外网访问 + +### 4. 定时备份你的Lukcy配置 + ## 简介 Lucky最初是作为一个小工具，由开发者为自己的个人使用而开发，用于替代socat，在小米路由AX6000官方系统上实现公网IPv6转内网IPv4的功能。Lucky的设计始终致力于让更多的Linux嵌入式设备运行，以实现或集成个人用户常用功能，降低用户的硬件和软件操作学习成本，同时引导使用者注意网络安全。随着版本更新和网友反馈，Lucky不断迭代改进，拥有更多功能和更好的性能，成为用户值得信赖的工具。 diff --git a/dockge/ghost/docker-compose.yml b/dockge/ghost/docker-compose.yml index 2db07cf99..b74d71429 100644 --- a/dockge/ghost/docker-compose.yml +++ b/dockge/ghost/docker-compose.yml @@ -14,7 +14,7 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true - image: ghost:6.10.0 + image: ghost:6.10.1 labels: createdBy: Apps networks: diff --git a/dockge/lucky/docker-compose.yml b/dockge/lucky/docker-compose.yml index e15a20a89..6fefca0bd 100644 --- a/dockge/lucky/docker-compose.yml +++ b/dockge/lucky/docker-compose.yml @@ -4,6 +4,8 @@ networks: services: lucky: container_name: lucky + entrypoint: + - /goodluck/start.sh env_file: - ./envs/global.env - .env @@ -17,4 +19,5 @@ services: - ${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/lucky/run/start.sh b/dockge/lucky/run/start.sh new file mode 100644 index 000000000..b38671f33 --- /dev/null +++ b/dockge/lucky/run/start.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +PORT=16601 + +/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 ${PORT}..." +while ! nc -z 127.0.0.1 "${PORT}" 2>/dev/null; do + sleep 1 +done + +echo "Lucky port ${PORT} is up" + +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}" + +wait $MAIN_PID