qyg2297248353/appstore-1panel
1
0
Fork 0
mirror of https://github.com/QYG2297248353/appstore-1panel.git synced 2026-06-16 01:02:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/custom' into custom

Browse Source
This commit is contained in:
ms
2025-12-09 12:51:46 +08:00
parent 0275ddec52 4618f21d8b
commit e7cf751d08
2 changed files with 64 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
appstore/lucky/2.20.2/run/start.sh
+32 -4
View File
@@ -1,22 +1,50 @@
#!/bin/sh #!/bin/sh
PORT=16601 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 & /app/lucky -c /goodluck/lucky.conf -runInDocker &
MAIN_PID=$! MAIN_PID=$!
echo "Lucky main started with PID $MAIN_PID" echo "Lucky main started with PID $MAIN_PID"
echo "Waiting for lucky to listen on port ${PORT}..." echo "Waiting for lucky to listen on port ${DETECT_PORT} (timeout ${WAIT_SECONDS}s)..."
while ! nc -z 127.0.0.1 "${PORT}" 2>/dev/null; do SECONDS_WAITED=0
while ! nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; do
sleep 1 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 done
echo "Lucky port ${PORT} is up" 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}" echo "Running: /app/lucky -rSetHttpAdminPort=${PANEL_APP_PORT_HTTP}"
/app/lucky -rSetHttpAdminPort="${PANEL_APP_PORT_HTTP}" /app/lucky -rSetHttpAdminPort="${PANEL_APP_PORT_HTTP}"
echo "Running: /app/lucky -rSetHttpsAdminPort=${PANEL_APP_PORT_HTTP}" echo "Running: /app/lucky -rSetHttpsAdminPort=${PANEL_APP_PORT_HTTP}"
/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 wait $MAIN_PID
dockge/lucky/run/start.sh
+32 -4
View File
@@ -1,22 +1,50 @@
#!/bin/sh #!/bin/sh
PORT=16601 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 & /app/lucky -c /goodluck/lucky.conf -runInDocker &
MAIN_PID=$! MAIN_PID=$!
echo "Lucky main started with PID $MAIN_PID" echo "Lucky main started with PID $MAIN_PID"
echo "Waiting for lucky to listen on port ${PORT}..." echo "Waiting for lucky to listen on port ${DETECT_PORT} (timeout ${WAIT_SECONDS}s)..."
while ! nc -z 127.0.0.1 "${PORT}" 2>/dev/null; do SECONDS_WAITED=0
while ! nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; do
sleep 1 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 done
echo "Lucky port ${PORT} is up" 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}" echo "Running: /app/lucky -rSetHttpAdminPort=${PANEL_APP_PORT_HTTP}"
/app/lucky -rSetHttpAdminPort="${PANEL_APP_PORT_HTTP}" /app/lucky -rSetHttpAdminPort="${PANEL_APP_PORT_HTTP}"
echo "Running: /app/lucky -rSetHttpsAdminPort=${PANEL_APP_PORT_HTTP}" echo "Running: /app/lucky -rSetHttpsAdminPort=${PANEL_APP_PORT_HTTP}"
/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 wait $MAIN_PID