Merge branch 'fawney19:main' into main

.env.example

@@ -69,8 +69,9 @@ ADMIN_USERNAME=admin123456
 # AETHER_DOCKER_UPDATE_COMMAND=./update.sh
 # AETHER_GATEWAY_DEPLOYMENT_TOPOLOGY=single-node
 # AETHER_GATEWAY_NODE_ROLE=all
-# Docker Compose 默认把应用日志输出到 stdout/stderr。
-# 如需文件日志，可改成 file 或 both，并把可写目录挂载到 /opt/aether/logs。
+# Docker Compose 默认强制把应用日志输出到 stdout/stderr，并由 Docker 轮转日志。
+# 如需文件日志，需要在 compose 里把 AETHER_LOG_DESTINATION 改成 file 或 both，
+# 并把容器用户可写目录挂载到 /opt/aether/logs。
 # AETHER_LOG_DESTINATION=stdout
 # AETHER_LOG_FORMAT=pretty
 # AETHER_LOG_DIR=/opt/aether/logs

Dockerfile.app

@@ -25,7 +25,7 @@ RUN ln -s /opt/aether/releases/image /opt/aether/current
 # --- final stage: distroless runtime ---
 FROM gcr.io/distroless/static-debian12
 
-COPY --from=layout --chown=65532:65532 /opt/aether /opt/aether
+COPY --from=layout /opt/aether /opt/aether
 
 WORKDIR /opt/aether
 
@@ -39,5 +39,5 @@ EXPOSE 8084
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
     CMD ["/opt/aether/current/bin/aether-gateway", "--healthcheck"]
 
-USER 65532:65532
+USER root
 ENTRYPOINT ["/opt/aether/current/bin/aether-gateway"]

README.md

@@ -69,7 +69,7 @@ Docker Compose 部署后，可在部署目录直接执行：
 ./update.sh --mode single-node
 ```
 
-仓库自带的 Docker Compose 默认把应用日志输出到容器 `stdout/stderr`，直接用 `docker compose logs -f app` 查看，避免正式发布镜像切换到非 root 用户后再被宿主机挂载日志目录的权限问题拖垮启动。如果你确实需要文件日志，再显式设置 `AETHER_LOG_DESTINATION=file|both`，并把一个可写目录挂载到 `/opt/aether/logs`（或同步覆盖 `AETHER_LOG_DIR`）。
+仓库自带的 Docker Compose 默认把应用日志输出到容器 `stdout/stderr`，直接用 `docker compose logs -f app` 查看，并由 Docker 轮转日志，避免正式发布镜像切换到非 root 用户后再被宿主机挂载日志目录的权限问题拖垮启动。如果你确实需要文件日志，需要在 compose 里把 `AETHER_LOG_DESTINATION` 改成 `file|both`，并额外挂载一个容器用户可写的目录到 `/opt/aether/logs`。
 
 管理后台右上角“版本信息”会检测新版本。Docker Compose 部署只提示版本，实际更新继续执行 `./update.sh`；systemd / launchd / 二进制部署才使用后台自更新，流程是下载对应平台的 GitHub Release 包、强制校验 `SHA256SUMS`、解压到 `/opt/aether/releases/<version>`，再切换 `/opt/aether/current` 并退出进程，交给 systemd / launchd 拉起新版本。
 

docker-compose.single-node.yml

@@ -2,6 +2,7 @@ services:
   app:
     image: ${APP_IMAGE:-ghcr.io/fawney19/aether:latest}
     container_name: aether-app
+    user: "0:0"
     env_file:
       - ${AETHER_ENV_FILE:-.env}
     environment:
@@ -14,17 +15,17 @@ services:
       AETHER_RUNTIME_BACKEND: memory
       AETHER_GATEWAY_DEPLOYMENT_TOPOLOGY: single-node
       AETHER_GATEWAY_NODE_ROLE: all
-      AETHER_LOG_DESTINATION: ${AETHER_LOG_DESTINATION:-stdout}
+      AETHER_LOG_DESTINATION: stdout
       AETHER_LOG_FORMAT: ${AETHER_LOG_FORMAT:-pretty}
-      AETHER_LOG_DIR: ${AETHER_LOG_DIR:-/opt/aether/logs}
-      AETHER_LOG_ROTATION: ${AETHER_LOG_ROTATION:-daily}
-      AETHER_LOG_RETENTION_DAYS: ${AETHER_LOG_RETENTION_DAYS:-7}
-      AETHER_LOG_MAX_FILES: ${AETHER_LOG_MAX_FILES:-30}
       APP_PORT: ${APP_PORT:-8084}
       AETHER_GATEWAY_AUTO_PREPARE_DATABASE: ${AETHER_GATEWAY_AUTO_PREPARE_DATABASE:-true}
     ports:
       - "${APP_PORT:-8084}:${APP_PORT:-8084}"
     volumes:
       - ./data:/opt/aether/data
-      - ./logs:/opt/aether/logs
+    logging:
+      driver: json-file
+      options:
+        max-size: "100m"
+        max-file: "10"
     restart: unless-stopped

docker-compose.yml

@@ -76,6 +76,7 @@ services:
   app:
     image: ${APP_IMAGE:-ghcr.io/fawney19/aether:latest}
     container_name: aether-app
+    user: "0:0"
     env_file:
       - .env
     environment:
@@ -85,12 +86,8 @@ services:
       AETHER_BASE_DIR: /opt/aether
       AETHER_UPDATE_STRATEGY: docker
       AETHER_DOCKER_UPDATE_COMMAND: ${AETHER_DOCKER_UPDATE_COMMAND:-./update.sh}
-      AETHER_LOG_DESTINATION: ${AETHER_LOG_DESTINATION:-stdout}
+      AETHER_LOG_DESTINATION: stdout
       AETHER_LOG_FORMAT: ${AETHER_LOG_FORMAT:-pretty}
-      AETHER_LOG_DIR: ${AETHER_LOG_DIR:-/opt/aether/logs}
-      AETHER_LOG_ROTATION: ${AETHER_LOG_ROTATION:-daily}
-      AETHER_LOG_RETENTION_DAYS: ${AETHER_LOG_RETENTION_DAYS:-7}
-      AETHER_LOG_MAX_FILES: ${AETHER_LOG_MAX_FILES:-30}
       APP_PORT: ${APP_PORT:-8084}
       AETHER_GATEWAY_AUTO_PREPARE_DATABASE: ${AETHER_GATEWAY_AUTO_PREPARE_DATABASE:-true}
     depends_on:
@@ -100,8 +97,11 @@ services:
         condition: service_healthy
     ports:
       - "${APP_PORT:-8084}:${APP_PORT:-8084}"
-    volumes:
-      - ./logs:/opt/aether/logs
+    logging:
+      driver: json-file
+      options:
+        max-size: "100m"
+        max-file: "10"
     restart: unless-stopped
 
 volumes: