diff --git a/appstore/lucky/2.23.1/.env b/appstore/lucky/2.23.1/.env new file mode 100644 index 000000000..d7c306db0 --- /dev/null +++ b/appstore/lucky/2.23.1/.env @@ -0,0 +1,9 @@ +# 网络模式 [必填] +NETWORK_MODE=host + +# 数据持久化路径 [必填] +LUCKY_ROOT_PATH=/home/lucky + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=16601 + diff --git a/appstore/lucky/2.23.1/data.yml b/appstore/lucky/2.23.1/data.yml new file mode 100644 index 000000000..1b04ae46a --- /dev/null +++ b/appstore/lucky/2.23.1/data.yml @@ -0,0 +1,33 @@ +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.23.1/docker-compose.yml b/appstore/lucky/2.23.1/docker-compose.yml new file mode 100644 index 000000000..bf24a43c2 --- /dev/null +++ b/appstore/lucky/2.23.1/docker-compose.yml @@ -0,0 +1,24 @@ +networks: + 1panel-network: + external: true +services: + lucky: + container_name: lucky + entrypoint: + - /app/conf/start.sh + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + image: gdy666/lucky:2.23.1 + labels: + createdBy: Apps + network_mode: ${NETWORK_MODE:-host} + ports: + - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} + restart: always + volumes: + - ./run/start.sh:/app/conf/start.sh:ro + - /var/run/docker.sock:/var/run/docker.sock + - ${LUCKY_ROOT_PATH}/data:/app/conf diff --git a/appstore/speedtest-tracker-sqlite/1.12.2/envs/default.env b/appstore/lucky/2.23.1/envs/default.env similarity index 100% rename from appstore/speedtest-tracker-sqlite/1.12.2/envs/default.env rename to appstore/lucky/2.23.1/envs/default.env diff --git a/appstore/speedtest-tracker-sqlite/1.12.2/envs/global.env b/appstore/lucky/2.23.1/envs/global.env similarity index 100% rename from appstore/speedtest-tracker-sqlite/1.12.2/envs/global.env rename to appstore/lucky/2.23.1/envs/global.env diff --git a/appstore/lucky/2.23.1/run/start.sh b/appstore/lucky/2.23.1/run/start.sh new file mode 100644 index 000000000..27858e6d9 --- /dev/null +++ b/appstore/lucky/2.23.1/run/start.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +DEFAULT_PORT=16601 +PORT_FILE="/app/conf/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 /app/conf/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.23.1/scripts/init.sh b/appstore/lucky/2.23.1/scripts/init.sh new file mode 100644 index 000000000..2dcbf3f8f --- /dev/null +++ b/appstore/lucky/2.23.1/scripts/init.sh @@ -0,0 +1,20 @@ +#!/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/speedtest-tracker-sqlite/1.12.2/scripts/uninstall.sh b/appstore/lucky/2.23.1/scripts/uninstall.sh similarity index 100% rename from appstore/speedtest-tracker-sqlite/1.12.2/scripts/uninstall.sh rename to appstore/lucky/2.23.1/scripts/uninstall.sh diff --git a/appstore/lucky/2.23.1/scripts/upgrade.sh b/appstore/lucky/2.23.1/scripts/upgrade.sh new file mode 100644 index 000000000..2dcbf3f8f --- /dev/null +++ b/appstore/lucky/2.23.1/scripts/upgrade.sh @@ -0,0 +1,20 @@ +#!/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/speedtest-tracker-sqlite/1.12.2/.env b/appstore/speedtest-tracker-sqlite/1.12.3/.env similarity index 100% rename from appstore/speedtest-tracker-sqlite/1.12.2/.env rename to appstore/speedtest-tracker-sqlite/1.12.3/.env diff --git a/appstore/speedtest-tracker-sqlite/1.12.2/data.yml b/appstore/speedtest-tracker-sqlite/1.12.3/data.yml similarity index 100% rename from appstore/speedtest-tracker-sqlite/1.12.2/data.yml rename to appstore/speedtest-tracker-sqlite/1.12.3/data.yml diff --git a/appstore/speedtest-tracker-sqlite/1.12.2/docker-compose.yml b/appstore/speedtest-tracker-sqlite/1.12.3/docker-compose.yml similarity index 91% rename from appstore/speedtest-tracker-sqlite/1.12.2/docker-compose.yml rename to appstore/speedtest-tracker-sqlite/1.12.3/docker-compose.yml index 5f6976229..7b0f0d4a7 100644 --- a/appstore/speedtest-tracker-sqlite/1.12.2/docker-compose.yml +++ b/appstore/speedtest-tracker-sqlite/1.12.3/docker-compose.yml @@ -14,7 +14,7 @@ services: - DISPLAY_TIMEZONE=Asia/Shanghai - DB_CONNECTION=sqlite - MAIL_MAILER=sqlite - image: linuxserver/speedtest-tracker:1.12.2 + image: linuxserver/speedtest-tracker:1.12.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/speedtest-tracker/1.12.2/envs/default.env b/appstore/speedtest-tracker-sqlite/1.12.3/envs/default.env similarity index 100% rename from appstore/speedtest-tracker/1.12.2/envs/default.env rename to appstore/speedtest-tracker-sqlite/1.12.3/envs/default.env diff --git a/appstore/speedtest-tracker/1.12.2/envs/global.env b/appstore/speedtest-tracker-sqlite/1.12.3/envs/global.env similarity index 100% rename from appstore/speedtest-tracker/1.12.2/envs/global.env rename to appstore/speedtest-tracker-sqlite/1.12.3/envs/global.env diff --git a/appstore/speedtest-tracker-sqlite/1.12.2/scripts/init.sh b/appstore/speedtest-tracker-sqlite/1.12.3/scripts/init.sh similarity index 100% rename from appstore/speedtest-tracker-sqlite/1.12.2/scripts/init.sh rename to appstore/speedtest-tracker-sqlite/1.12.3/scripts/init.sh diff --git a/appstore/speedtest-tracker/1.12.2/scripts/uninstall.sh b/appstore/speedtest-tracker-sqlite/1.12.3/scripts/uninstall.sh similarity index 100% rename from appstore/speedtest-tracker/1.12.2/scripts/uninstall.sh rename to appstore/speedtest-tracker-sqlite/1.12.3/scripts/uninstall.sh diff --git a/appstore/speedtest-tracker-sqlite/1.12.2/scripts/upgrade.sh b/appstore/speedtest-tracker-sqlite/1.12.3/scripts/upgrade.sh similarity index 100% rename from appstore/speedtest-tracker-sqlite/1.12.2/scripts/upgrade.sh rename to appstore/speedtest-tracker-sqlite/1.12.3/scripts/upgrade.sh diff --git a/appstore/speedtest-tracker/1.12.2/.env b/appstore/speedtest-tracker/1.12.3/.env similarity index 100% rename from appstore/speedtest-tracker/1.12.2/.env rename to appstore/speedtest-tracker/1.12.3/.env diff --git a/appstore/speedtest-tracker/1.12.2/data.yml b/appstore/speedtest-tracker/1.12.3/data.yml similarity index 100% rename from appstore/speedtest-tracker/1.12.2/data.yml rename to appstore/speedtest-tracker/1.12.3/data.yml diff --git a/appstore/speedtest-tracker/1.12.2/docker-compose.yml b/appstore/speedtest-tracker/1.12.3/docker-compose.yml similarity index 90% rename from appstore/speedtest-tracker/1.12.2/docker-compose.yml rename to appstore/speedtest-tracker/1.12.3/docker-compose.yml index ddf0c3a57..f4d8c57c0 100644 --- a/appstore/speedtest-tracker/1.12.2/docker-compose.yml +++ b/appstore/speedtest-tracker/1.12.3/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=1000 - TZ=Asia/Shanghai - DISPLAY_TIMEZONE=Asia/Shanghai - image: linuxserver/speedtest-tracker:1.12.2 + image: linuxserver/speedtest-tracker:1.12.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/speedtest-tracker/1.12.3/envs/default.env b/appstore/speedtest-tracker/1.12.3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/appstore/speedtest-tracker/1.12.3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/appstore/speedtest-tracker/1.12.3/envs/global.env b/appstore/speedtest-tracker/1.12.3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/appstore/speedtest-tracker/1.12.3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/appstore/speedtest-tracker/1.12.2/scripts/init.sh b/appstore/speedtest-tracker/1.12.3/scripts/init.sh similarity index 100% rename from appstore/speedtest-tracker/1.12.2/scripts/init.sh rename to appstore/speedtest-tracker/1.12.3/scripts/init.sh diff --git a/appstore/speedtest-tracker/1.12.3/scripts/uninstall.sh b/appstore/speedtest-tracker/1.12.3/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/speedtest-tracker/1.12.3/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/speedtest-tracker/1.12.2/scripts/upgrade.sh b/appstore/speedtest-tracker/1.12.3/scripts/upgrade.sh similarity index 100% rename from appstore/speedtest-tracker/1.12.2/scripts/upgrade.sh rename to appstore/speedtest-tracker/1.12.3/scripts/upgrade.sh diff --git a/dockge/lucky/docker-compose.yml b/dockge/lucky/docker-compose.yml index 6fefca0bd..bf24a43c2 100644 --- a/dockge/lucky/docker-compose.yml +++ b/dockge/lucky/docker-compose.yml @@ -5,13 +5,13 @@ services: lucky: container_name: lucky entrypoint: - - /goodluck/start.sh + - /app/conf/start.sh env_file: - ./envs/global.env - .env environment: - TZ=Asia/Shanghai - image: gdy666/lucky:2.20.2 + image: gdy666/lucky:2.23.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} @@ -19,5 +19,6 @@ services: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} restart: always volumes: - - ./run/start.sh:/goodluck/start.sh:ro - - ${LUCKY_ROOT_PATH}/data:/goodluck + - ./run/start.sh:/app/conf/start.sh:ro + - /var/run/docker.sock:/var/run/docker.sock + - ${LUCKY_ROOT_PATH}/data:/app/conf diff --git a/dockge/lucky/run/start.sh b/dockge/lucky/run/start.sh index 57057d511..27858e6d9 100644 --- a/dockge/lucky/run/start.sh +++ b/dockge/lucky/run/start.sh @@ -1,7 +1,7 @@ #!/bin/sh DEFAULT_PORT=16601 -PORT_FILE="/goodluck/port" +PORT_FILE="/app/conf/port" WAIT_SECONDS=30 if [ -f "$PORT_FILE" ]; then @@ -12,7 +12,7 @@ else echo "No previous port found, using default port: ${DETECT_PORT}" fi -/app/lucky -c /goodluck/lucky.conf -runInDocker & +/app/lucky -c /app/conf/lucky.conf -runInDocker & MAIN_PID=$! echo "Lucky main started with PID $MAIN_PID" diff --git a/dockge/lucky_2_20_2/.env b/dockge/lucky_2_20_2/.env new file mode 100644 index 000000000..d7c306db0 --- /dev/null +++ b/dockge/lucky_2_20_2/.env @@ -0,0 +1,9 @@ +# 网络模式 [必填] +NETWORK_MODE=host + +# 数据持久化路径 [必填] +LUCKY_ROOT_PATH=/home/lucky + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=16601 + diff --git a/dockge/lucky_2_20_2/docker-compose.yml b/dockge/lucky_2_20_2/docker-compose.yml new file mode 100644 index 000000000..6fefca0bd --- /dev/null +++ b/dockge/lucky_2_20_2/docker-compose.yml @@ -0,0 +1,23 @@ +networks: + 1panel-network: + external: true +services: + lucky: + container_name: lucky + entrypoint: + - /goodluck/start.sh + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + image: gdy666/lucky:2.20.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/lucky_2_20_2/envs/default.env b/dockge/lucky_2_20_2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/lucky_2_20_2/envs/default.env @@ -0,0 +1,2 @@ +# 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 new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/lucky_2_20_2/envs/global.env @@ -0,0 +1,2 @@ +# 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 new file mode 100644 index 000000000..57057d511 --- /dev/null +++ b/dockge/lucky_2_20_2/run/start.sh @@ -0,0 +1,50 @@ +#!/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/speedtest-tracker-sqlite/docker-compose.yml b/dockge/speedtest-tracker-sqlite/docker-compose.yml index 5f6976229..7b0f0d4a7 100644 --- a/dockge/speedtest-tracker-sqlite/docker-compose.yml +++ b/dockge/speedtest-tracker-sqlite/docker-compose.yml @@ -14,7 +14,7 @@ services: - DISPLAY_TIMEZONE=Asia/Shanghai - DB_CONNECTION=sqlite - MAIL_MAILER=sqlite - image: linuxserver/speedtest-tracker:1.12.2 + image: linuxserver/speedtest-tracker:1.12.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/speedtest-tracker/docker-compose.yml b/dockge/speedtest-tracker/docker-compose.yml index ddf0c3a57..f4d8c57c0 100644 --- a/dockge/speedtest-tracker/docker-compose.yml +++ b/dockge/speedtest-tracker/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=1000 - TZ=Asia/Shanghai - DISPLAY_TIMEZONE=Asia/Shanghai - image: linuxserver/speedtest-tracker:1.12.2 + image: linuxserver/speedtest-tracker:1.12.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE}