diff --git a/appstore/byte-muse/1.26.4/.env b/appstore/byte-muse/1.26.6/.env similarity index 100% rename from appstore/byte-muse/1.26.4/.env rename to appstore/byte-muse/1.26.6/.env diff --git a/appstore/byte-muse/1.26.4/data.yml b/appstore/byte-muse/1.26.6/data.yml similarity index 100% rename from appstore/byte-muse/1.26.4/data.yml rename to appstore/byte-muse/1.26.6/data.yml diff --git a/appstore/byte-muse/1.26.4/docker-compose.yml b/appstore/byte-muse/1.26.6/docker-compose.yml similarity index 95% rename from appstore/byte-muse/1.26.4/docker-compose.yml rename to appstore/byte-muse/1.26.6/docker-compose.yml index d8ea1545a..b6bb92229 100644 --- a/appstore/byte-muse/1.26.4/docker-compose.yml +++ b/appstore/byte-muse/1.26.6/docker-compose.yml @@ -11,7 +11,7 @@ services: - HTTPS_PROXY=${HTTP_PROXY} - HTTP_PROXY=${HTTP_PROXY:-} - NO_PROXY=${NO_PROXY:-} - image: envyafish/byte-muse:1.26.4 + image: envyafish/byte-muse:1.26.6 labels: createdBy: Apps networks: diff --git a/appstore/byte-muse/1.26.4/envs/default.env b/appstore/byte-muse/1.26.6/envs/default.env similarity index 100% rename from appstore/byte-muse/1.26.4/envs/default.env rename to appstore/byte-muse/1.26.6/envs/default.env diff --git a/appstore/byte-muse/1.26.4/envs/global.env b/appstore/byte-muse/1.26.6/envs/global.env similarity index 100% rename from appstore/byte-muse/1.26.4/envs/global.env rename to appstore/byte-muse/1.26.6/envs/global.env diff --git a/appstore/byte-muse/1.26.4/scripts/init.sh b/appstore/byte-muse/1.26.6/scripts/init.sh similarity index 100% rename from appstore/byte-muse/1.26.4/scripts/init.sh rename to appstore/byte-muse/1.26.6/scripts/init.sh diff --git a/appstore/byte-muse/1.26.4/scripts/uninstall.sh b/appstore/byte-muse/1.26.6/scripts/uninstall.sh similarity index 100% rename from appstore/byte-muse/1.26.4/scripts/uninstall.sh rename to appstore/byte-muse/1.26.6/scripts/uninstall.sh diff --git a/appstore/byte-muse/1.26.4/scripts/upgrade.sh b/appstore/byte-muse/1.26.6/scripts/upgrade.sh similarity index 100% rename from appstore/byte-muse/1.26.4/scripts/upgrade.sh rename to appstore/byte-muse/1.26.6/scripts/upgrade.sh diff --git a/appstore/lucky/2.23.3/.env b/appstore/lucky/2.24.0/.env similarity index 100% rename from appstore/lucky/2.23.3/.env rename to appstore/lucky/2.24.0/.env diff --git a/appstore/lucky/2.23.3/data.yml b/appstore/lucky/2.24.0/data.yml similarity index 100% rename from appstore/lucky/2.23.3/data.yml rename to appstore/lucky/2.24.0/data.yml diff --git a/appstore/lucky/2.23.3/docker-compose.yml b/appstore/lucky/2.24.0/docker-compose.yml similarity index 94% rename from appstore/lucky/2.23.3/docker-compose.yml rename to appstore/lucky/2.24.0/docker-compose.yml index f431749fa..99a0a96ac 100644 --- a/appstore/lucky/2.23.3/docker-compose.yml +++ b/appstore/lucky/2.24.0/docker-compose.yml @@ -11,7 +11,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: gdy666/lucky:2.23.3 + image: gdy666/lucky:2.24.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/appstore/lucky/2.23.3/envs/default.env b/appstore/lucky/2.24.0/envs/default.env similarity index 100% rename from appstore/lucky/2.23.3/envs/default.env rename to appstore/lucky/2.24.0/envs/default.env diff --git a/appstore/lucky/2.23.3/envs/global.env b/appstore/lucky/2.24.0/envs/global.env similarity index 100% rename from appstore/lucky/2.23.3/envs/global.env rename to appstore/lucky/2.24.0/envs/global.env diff --git a/appstore/lucky/2.23.3/run/start.sh b/appstore/lucky/2.24.0/run/start.sh similarity index 100% rename from appstore/lucky/2.23.3/run/start.sh rename to appstore/lucky/2.24.0/run/start.sh diff --git a/appstore/lucky/2.23.3/scripts/init.sh b/appstore/lucky/2.24.0/scripts/init.sh similarity index 100% rename from appstore/lucky/2.23.3/scripts/init.sh rename to appstore/lucky/2.24.0/scripts/init.sh diff --git a/appstore/lucky/2.23.3/scripts/uninstall.sh b/appstore/lucky/2.24.0/scripts/uninstall.sh similarity index 100% rename from appstore/lucky/2.23.3/scripts/uninstall.sh rename to appstore/lucky/2.24.0/scripts/uninstall.sh diff --git a/appstore/lucky/2.23.3/scripts/upgrade.sh b/appstore/lucky/2.24.0/scripts/upgrade.sh similarity index 100% rename from appstore/lucky/2.23.3/scripts/upgrade.sh rename to appstore/lucky/2.24.0/scripts/upgrade.sh diff --git a/dockge/byte-muse/docker-compose.yml b/dockge/byte-muse/docker-compose.yml index d8ea1545a..b6bb92229 100644 --- a/dockge/byte-muse/docker-compose.yml +++ b/dockge/byte-muse/docker-compose.yml @@ -11,7 +11,7 @@ services: - HTTPS_PROXY=${HTTP_PROXY} - HTTP_PROXY=${HTTP_PROXY:-} - NO_PROXY=${NO_PROXY:-} - image: envyafish/byte-muse:1.26.4 + image: envyafish/byte-muse:1.26.6 labels: createdBy: Apps networks: diff --git a/dockge/lucky/docker-compose.yml b/dockge/lucky/docker-compose.yml index f431749fa..6fefca0bd 100644 --- a/dockge/lucky/docker-compose.yml +++ b/dockge/lucky/docker-compose.yml @@ -5,13 +5,13 @@ services: lucky: container_name: lucky entrypoint: - - /app/conf/start.sh + - /goodluck/start.sh env_file: - ./envs/global.env - .env environment: - TZ=Asia/Shanghai - image: gdy666/lucky:2.23.3 + image: gdy666/lucky:2.20.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} @@ -19,6 +19,5 @@ services: - ${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 + - ./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 index 4d33c1d39..57057d511 100644 --- a/dockge/lucky/run/start.sh +++ b/dockge/lucky/run/start.sh @@ -1,9 +1,8 @@ #!/bin/sh DEFAULT_PORT=16601 -PORT_FILE="/app/conf/port" +PORT_FILE="/goodluck/port" WAIT_SECONDS=30 -DELAY_AFTER_PORT_UP=5 if [ -f "$PORT_FILE" ]; then DETECT_PORT=$(cat "$PORT_FILE") @@ -13,7 +12,7 @@ else echo "No previous port found, using default port: ${DETECT_PORT}" fi -/app/lucky -c /app/conf/lucky.conf -runInDocker & +/app/lucky -c /goodluck/lucky.conf -runInDocker & MAIN_PID=$! echo "Lucky main started with PID $MAIN_PID" @@ -31,8 +30,7 @@ while ! nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; do done if nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; then - echo "Port ${DETECT_PORT} is up. Waiting extra ${DELAY_AFTER_PORT_UP}s..." - sleep ${DELAY_AFTER_PORT_UP} + echo "Port ${DETECT_PORT} is up." else echo "Port ${DETECT_PORT} still not open, continuing anyway." fi diff --git a/dockge/lucky_2_20_2/.env b/dockge/lucky_2_24_0/.env similarity index 100% rename from dockge/lucky_2_20_2/.env rename to dockge/lucky_2_24_0/.env diff --git a/dockge/lucky_2_20_2/docker-compose.yml b/dockge/lucky_2_24_0/docker-compose.yml similarity index 66% rename from dockge/lucky_2_20_2/docker-compose.yml rename to dockge/lucky_2_24_0/docker-compose.yml index 6fefca0bd..99a0a96ac 100644 --- a/dockge/lucky_2_20_2/docker-compose.yml +++ b/dockge/lucky_2_24_0/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.24.0 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_2_20_2/envs/default.env b/dockge/lucky_2_24_0/envs/default.env similarity index 100% rename from dockge/lucky_2_20_2/envs/default.env rename to dockge/lucky_2_24_0/envs/default.env diff --git a/dockge/lucky_2_20_2/envs/global.env b/dockge/lucky_2_24_0/envs/global.env similarity index 100% rename from dockge/lucky_2_20_2/envs/global.env rename to dockge/lucky_2_24_0/envs/global.env diff --git a/dockge/lucky_2_20_2/run/start.sh b/dockge/lucky_2_24_0/run/start.sh similarity index 85% rename from dockge/lucky_2_20_2/run/start.sh rename to dockge/lucky_2_24_0/run/start.sh index 57057d511..4d33c1d39 100644 --- a/dockge/lucky_2_20_2/run/start.sh +++ b/dockge/lucky_2_24_0/run/start.sh @@ -1,8 +1,9 @@ #!/bin/sh DEFAULT_PORT=16601 -PORT_FILE="/goodluck/port" +PORT_FILE="/app/conf/port" WAIT_SECONDS=30 +DELAY_AFTER_PORT_UP=5 if [ -f "$PORT_FILE" ]; then DETECT_PORT=$(cat "$PORT_FILE") @@ -12,7 +13,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" @@ -30,7 +31,8 @@ while ! nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; do done if nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; then - echo "Port ${DETECT_PORT} is up." + echo "Port ${DETECT_PORT} is up. Waiting extra ${DELAY_AFTER_PORT_UP}s..." + sleep ${DELAY_AFTER_PORT_UP} else echo "Port ${DETECT_PORT} still not open, continuing anyway." fi