mirror of
https://github.com/QYG2297248353/appstore-1panel.git
synced 2026-06-16 01:02:14 +08:00
Processed apps directory via GitHub Actions
This commit is contained in:
@@ -11,7 +11,7 @@ services:
|
|||||||
- .env
|
- .env
|
||||||
environment:
|
environment:
|
||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
image: gdy666/lucky:2.24.0
|
image: gdy666/lucky:2.25.0
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
network_mode: ${NETWORK_MODE:-host}
|
network_mode: ${NETWORK_MODE:-host}
|
||||||
@@ -5,13 +5,13 @@ services:
|
|||||||
lucky:
|
lucky:
|
||||||
container_name: lucky
|
container_name: lucky
|
||||||
entrypoint:
|
entrypoint:
|
||||||
- /goodluck/start.sh
|
- /app/conf/start.sh
|
||||||
env_file:
|
env_file:
|
||||||
- ./envs/global.env
|
- ./envs/global.env
|
||||||
- .env
|
- .env
|
||||||
environment:
|
environment:
|
||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
image: gdy666/lucky:2.20.2
|
image: gdy666/lucky:2.25.0
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
network_mode: ${NETWORK_MODE:-host}
|
network_mode: ${NETWORK_MODE:-host}
|
||||||
@@ -19,5 +19,6 @@ services:
|
|||||||
- ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP}
|
- ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP}
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- ./run/start.sh:/goodluck/start.sh:ro
|
- ./run/start.sh:/app/conf/start.sh:ro
|
||||||
- ${LUCKY_ROOT_PATH}/data:/goodluck
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
|
- ${LUCKY_ROOT_PATH}/data:/app/conf
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
DEFAULT_PORT=16601
|
DEFAULT_PORT=16601
|
||||||
PORT_FILE="/goodluck/port"
|
PORT_FILE="/app/conf/port"
|
||||||
WAIT_SECONDS=30
|
WAIT_SECONDS=30
|
||||||
|
DELAY_AFTER_PORT_UP=5
|
||||||
|
|
||||||
if [ -f "$PORT_FILE" ]; then
|
if [ -f "$PORT_FILE" ]; then
|
||||||
DETECT_PORT=$(cat "$PORT_FILE")
|
DETECT_PORT=$(cat "$PORT_FILE")
|
||||||
@@ -12,7 +13,7 @@ else
|
|||||||
echo "No previous port found, using default port: ${DETECT_PORT}"
|
echo "No previous port found, using default port: ${DETECT_PORT}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/app/lucky -c /goodluck/lucky.conf -runInDocker &
|
/app/lucky -c /app/conf/lucky.conf -runInDocker &
|
||||||
MAIN_PID=$!
|
MAIN_PID=$!
|
||||||
|
|
||||||
echo "Lucky main started with PID $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
|
done
|
||||||
|
|
||||||
if nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; then
|
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
|
else
|
||||||
echo "Port ${DETECT_PORT} still not open, continuing anyway."
|
echo "Port ${DETECT_PORT} still not open, continuing anyway."
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -5,13 +5,13 @@ services:
|
|||||||
lucky:
|
lucky:
|
||||||
container_name: lucky
|
container_name: lucky
|
||||||
entrypoint:
|
entrypoint:
|
||||||
- /app/conf/start.sh
|
- /goodluck/start.sh
|
||||||
env_file:
|
env_file:
|
||||||
- ./envs/global.env
|
- ./envs/global.env
|
||||||
- .env
|
- .env
|
||||||
environment:
|
environment:
|
||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
image: gdy666/lucky:2.24.0
|
image: gdy666/lucky:2.20.2
|
||||||
labels:
|
labels:
|
||||||
createdBy: Apps
|
createdBy: Apps
|
||||||
network_mode: ${NETWORK_MODE:-host}
|
network_mode: ${NETWORK_MODE:-host}
|
||||||
@@ -19,6 +19,5 @@ services:
|
|||||||
- ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP}
|
- ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP}
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- ./run/start.sh:/app/conf/start.sh:ro
|
- ./run/start.sh:/goodluck/start.sh:ro
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- ${LUCKY_ROOT_PATH}/data:/goodluck
|
||||||
- ${LUCKY_ROOT_PATH}/data:/app/conf
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
DEFAULT_PORT=16601
|
DEFAULT_PORT=16601
|
||||||
PORT_FILE="/app/conf/port"
|
PORT_FILE="/goodluck/port"
|
||||||
WAIT_SECONDS=30
|
WAIT_SECONDS=30
|
||||||
DELAY_AFTER_PORT_UP=5
|
|
||||||
|
|
||||||
if [ -f "$PORT_FILE" ]; then
|
if [ -f "$PORT_FILE" ]; then
|
||||||
DETECT_PORT=$(cat "$PORT_FILE")
|
DETECT_PORT=$(cat "$PORT_FILE")
|
||||||
@@ -13,7 +12,7 @@ else
|
|||||||
echo "No previous port found, using default port: ${DETECT_PORT}"
|
echo "No previous port found, using default port: ${DETECT_PORT}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/app/lucky -c /app/conf/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"
|
||||||
@@ -31,8 +30,7 @@ while ! nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
if nc -z 127.0.0.1 "${DETECT_PORT}" 2>/dev/null; then
|
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..."
|
echo "Port ${DETECT_PORT} is up."
|
||||||
sleep ${DELAY_AFTER_PORT_UP}
|
|
||||||
else
|
else
|
||||||
echo "Port ${DETECT_PORT} still not open, continuing anyway."
|
echo "Port ${DETECT_PORT} still not open, continuing anyway."
|
||||||
fi
|
fi
|
||||||
Reference in New Issue
Block a user