From 81cbb69237b6a6f38137cae808160739e9dfb8e5 Mon Sep 17 00:00:00 2001 From: PhoenixHai <453823+dave_hai@user.noreply.gitee.com> Date: Wed, 12 Nov 2025 18:24:29 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Adocker=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cn-universal-web/Dockerfile | 7 +- cn-universal-web/Dockerfile.alpine | 2 +- .../src/main/resources/logback-spring.xml | 437 +++++++++--------- docker-compose.yml | 3 +- docker/docker-compose.yml | 3 +- 5 files changed, 229 insertions(+), 223 deletions(-) diff --git a/cn-universal-web/Dockerfile b/cn-universal-web/Dockerfile index c86d85d..ffb07d8 100644 --- a/cn-universal-web/Dockerfile +++ b/cn-universal-web/Dockerfile @@ -33,7 +33,8 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=60s --retries=3 \ CMD curl -f http://localhost:9092/actuator/health || exit 1 # 预创建日志目录 -RUN mkdir -p /app/logs +RUN mkdir -p /app/logs /app/logs/global /app/logs/api /app/logs/tcp /app/logs/mqtt -# 启动命令:创建日志目录,执行脚本后台启动,再跟随实际项目日志保持前台 -ENTRYPOINT ["sh", "-c", "mkdir -p /app/logs && cn-universal-web/bin/start.sh && tail -F /app/logs/cn-universal-web.log"] +# 启动命令:创建日志目录,执行启动脚本,前台跟随 info.log 保持容器存活 +ENTRYPOINT ["sh", "-c", "mkdir -p /app/logs && /app/cn-universal-web/bin/start.sh && tail -F /app/logs/info.log"] +ENTRYPOINT ["sh", "-c", "mkdir -p /app/logs /app/logs/global /app/logs/api /app/logs/tcp /app/logs/mqtt && touch /app/logs/cn-universal-web.log /app/logs/all.log /app/logs/global/info.log /app/logs/global/warn.log /app/logs/global/error.log && cn-universal-web/bin/start.sh && tail -n +1 -F /app/logs/all.log /app/logs/cn-universal-web.log /app/logs/global/info.log /app/logs/global/warn.log /app/logs/global/error.log"] diff --git a/cn-universal-web/Dockerfile.alpine b/cn-universal-web/Dockerfile.alpine index 0a68038..523d3c3 100644 --- a/cn-universal-web/Dockerfile.alpine +++ b/cn-universal-web/Dockerfile.alpine @@ -29,4 +29,4 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=60s --retries=3 \ RUN mkdir -p /app/logs # 启动命令:创建日志目录,执行脚本后台启动,再跟随实际项目日志保持前台 -ENTRYPOINT ["sh", "-c", "mkdir -p /app/logs && cn-universal-web/bin/start.sh && tail -F /app/logs/cn-universal-web.log"] +ENTRYPOINT ["sh", "-c", "mkdir -p /app/logs && cn-universal-web/bin/start.sh && tail -F /app/logs/info.log"] diff --git a/cn-universal-web/src/main/resources/logback-spring.xml b/cn-universal-web/src/main/resources/logback-spring.xml index dcde4c5..b16e3b8 100644 --- a/cn-universal-web/src/main/resources/logback-spring.xml +++ b/cn-universal-web/src/main/resources/logback-spring.xml @@ -1,239 +1,246 @@ - - + + - - - - - - - - + + + + + + + + - - - ${log.path}/all.log - - ${log.path}/all.%d{yyyy-MM-dd}.%i.gz - 1GB - 15 - - - ${all.pattern} - UTF-8 - - - INFO - - + + + ${log.path}/info.log + + ${log.path}/info.%d{yyyy-MM-dd}.%i.gz + 1GB + 15 + + + ${all.pattern} + UTF-8 + + + INFO + + - - - ${log.path}/global/info.log - - ${log.path}/global/info.%d{yyyy-MM-dd}.%i.gz - 500MB - 30 - - - ${global.pattern} - UTF-8 - - - INFO - ACCEPT - DENY - - + + ${log.path}/warn.log + + ${log.path}/warn.%d{yyyy-MM-dd}.%i.gz + 500MB + 30 + + + ${global.pattern} + UTF-8 + + + WARN + ACCEPT + DENY + + - - ${log.path}/global/warn.log - - ${log.path}/global/warn.%d{yyyy-MM-dd}.%i.gz - 500MB - 30 - - - ${global.pattern} - UTF-8 - - - WARN - ACCEPT - DENY - - + + ${log.path}/error.log + + ${log.path}/error.%d{yyyy-MM-dd}.%i.gz + 500MB + 90 + + + ${global.pattern} + UTF-8 + + + ERROR + ACCEPT + DENY + + - - ${log.path}/global/error.log - - ${log.path}/global/error.%d{yyyy-MM-dd}.%i.gz - 500MB - 90 - - - ${global.pattern} - UTF-8 - - - ERROR - ACCEPT - DENY - - + + + ${log.path}/api.log + + ${log.path}/api.%d{yyyy-MM-dd}.%i.gz + 500MB + 30 + + + ${module.pattern} + UTF-8 + + + INFO + + - - - ${log.path}/api/api.log - - ${log.path}/api/api.%d{yyyy-MM-dd}.%i.gz - 500MB - 30 - - - ${module.pattern} - UTF-8 - - - INFO - - + + ${log.path}/tcp.log + + ${log.path}/tcp.%d{yyyy-MM-dd}.%i.gz + 500MB + 30 + + + ${module.pattern} + UTF-8 + + + INFO + + - - ${log.path}/tcp/tcp.log - - ${log.path}/tcp/tcp.%d{yyyy-MM-dd}.%i.gz - 500MB - 30 - - - ${module.pattern} - UTF-8 - - - INFO - - + + ${log.path}/mqtt.log + + ${log.path}/mqtt.%d{yyyy-MM-dd}.%i.gz + 500MB + 30 + + + ${module.pattern} + UTF-8 + + + INFO + + - - ${log.path}/mqtt/mqtt.log - - ${log.path}/mqtt/mqtt.%d{yyyy-MM-dd}.%i.gz - 500MB - 30 - - - ${module.pattern} - UTF-8 - - - INFO - - + + + + ${console.pattern} + UTF-8 + + + INFO + + - - - - ${console.pattern} - UTF-8 - - - INFO - - + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - + + + + + + + - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + - - + + + + + + + + + + - - - - - + + + + + + + + - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - - - - - + + + + + \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index f62e040..a4c4582 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,10 +22,9 @@ services: - MQTT_CFG_HOST_OUT=${MQTT_HOST_OUT:-tcp://127.0.0.1:1883} - MQTT_CFG_EMQX_HEADER_KEY=${EMQX_HEADER_KEY:-universal-emqx} - MQTT_CFG_EMQX_HEADER_VALUE=${EMQX_HEADER_VALUE:-d41d8cd98f00b204e9800998ecf8427e} - - SPRING_PROFILES_ACTIVE=docker + - SPRING_PROFILES_ACTIVE=docker,prod - RUN_MODE=docker - LOGGING_FILE_PATH=/app/logs - - LOGGING_FILE_NAME=/app/logs/cn-universal-web.log - SERVER_PORT=9092 - SERVER_HTTP2_ENABLED=false - JAVA_TOOL_OPTIONS=-Dio.netty.native.workdir=/app/logs diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e36fb51..92b34b8 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -36,8 +36,7 @@ services: # 应用配置 - SPRING_PROFILES_ACTIVE=docker - RUN_MODE=docker - - LOGGING_FILE_PATH=/app/logs/cn-universal2 - - LOGGING_FILE_NAME=/app/logs/cn-universal-web.log + - LOGGING_FILE_PATH=/app/logs - SERVER_PORT=9092 - SERVER_HTTP2_ENABLED=false - JAVA_TOOL_OPTIONS=-Dio.netty.native.workdir=/app/logs