Processed apps directory via GitHub Actions

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

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"

dockge/lucky_2_20_2/.env

@@ -0,0 +1,9 @@
+# 网络模式 [必填] 
+NETWORK_MODE=host
+
+# 数据持久化路径 [必填] 
+LUCKY_ROOT_PATH=/home/lucky
+
+# WebUI 端口 [必填] 
+PANEL_APP_PORT_HTTP=16601
+

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

dockge/lucky_2_20_2/envs/default.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+ENV_FILE=.env

dockge/lucky_2_20_2/envs/global.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+TZ=Asia/Shanghai

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

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}

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}