修复(dev): 启动时只跟随本次新日志
This commit is contained in:
@@ -4,10 +4,13 @@ set -Eeuo pipefail
|
|||||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
COMPOSE_FILE="${ROOT_DIR}/docker-compose.dev.yml"
|
COMPOSE_FILE="${ROOT_DIR}/docker-compose.dev.yml"
|
||||||
LOG_TAIL="${DEV_LOG_TAIL:-120}"
|
LOG_TAIL="${DEV_LOG_TAIL:-120}"
|
||||||
|
START_LOG_TAIL="${DEV_START_LOG_TAIL:-0}"
|
||||||
|
|
||||||
follow_app_logs() {
|
follow_app_logs() {
|
||||||
|
local tail="${1:-${LOG_TAIL}}"
|
||||||
printf '\n[dev] 跟踪 backend / frontend / web 日志(Ctrl+C 只退出日志,不停止容器)\n'
|
printf '\n[dev] 跟踪 backend / frontend / web 日志(Ctrl+C 只退出日志,不停止容器)\n'
|
||||||
docker compose -f "${COMPOSE_FILE}" logs -f --tail="${LOG_TAIL}" backend frontend web
|
printf '[dev] 默认从本次启动后的新日志开始;查看历史请执行 ./dev.sh logs\n'
|
||||||
|
docker compose -f "${COMPOSE_FILE}" logs -f --tail="${tail}" backend frontend web
|
||||||
}
|
}
|
||||||
|
|
||||||
case "${1:-}" in
|
case "${1:-}" in
|
||||||
@@ -29,7 +32,7 @@ case "${1:-}" in
|
|||||||
;;
|
;;
|
||||||
"")
|
"")
|
||||||
bash "${ROOT_DIR}/deploy/mac-dev.sh"
|
bash "${ROOT_DIR}/deploy/mac-dev.sh"
|
||||||
follow_app_logs
|
follow_app_logs "${START_LOG_TAIL}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
exec bash "${ROOT_DIR}/deploy/mac-dev.sh" "$@"
|
exec bash "${ROOT_DIR}/deploy/mac-dev.sh" "$@"
|
||||||
|
|||||||
Reference in New Issue
Block a user