From 373845450bfe74fdd0e8db04f2e47e3fa2ea865c Mon Sep 17 00:00:00 2001
From: fawney19 <elky0401@gmail.com>
Date: Wed, 7 Jan 2026 15:19:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8C=96=20docker-compose?=
 =?UTF-8?q?=20=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

使用 env_file 加载 .env 文件，移除冗余的环境变量声明，
仅保留需要组合的变量和容器级别设置
---
 docker-compose.build.yml | 15 ++++-----------
 docker-compose.yml       | 15 ++++-----------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/docker-compose.build.yml b/docker-compose.build.yml
index 3b5d58a..6d0010f 100644
--- a/docker-compose.build.yml
+++ b/docker-compose.build.yml
@@ -44,20 +44,13 @@ services:
       dockerfile: Dockerfile.app.local
     image: aether-app:latest
     container_name: aether-app
+    env_file:
+      - .env
     environment:
+      # 需要组合的变量
       DATABASE_URL: postgresql://postgres:${DB_PASSWORD}@postgres:5432/aether
       REDIS_URL: redis://:${REDIS_PASSWORD}@redis:6379/0
-      PORT: 8084
-      JWT_SECRET_KEY: ${JWT_SECRET_KEY}
-      ENCRYPTION_KEY: ${ENCRYPTION_KEY}
-      JWT_ALGORITHM: HS256
-      JWT_EXPIRATION_DELTA: 86400
-      LOG_LEVEL: ${LOG_LEVEL:-INFO}
-      ADMIN_EMAIL: ${ADMIN_EMAIL}
-      ADMIN_USERNAME: ${ADMIN_USERNAME}
-      ADMIN_PASSWORD: ${ADMIN_PASSWORD}
-      API_KEY_PREFIX: ${API_KEY_PREFIX:-sk}
-      GUNICORN_WORKERS: ${GUNICORN_WORKERS:-4}
+      # 容器级别设置
       TZ: Asia/Shanghai
       PYTHONIOENCODING: utf-8
       LANG: C.UTF-8
diff --git a/docker-compose.yml b/docker-compose.yml
index 143729b..24e0c67 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,20 +35,13 @@ services:
   app:
     image: ghcr.io/fawney19/aether:latest
     container_name: aether-app
+    env_file:
+      - .env
     environment:
+      # 需要组合的变量
       DATABASE_URL: postgresql://postgres:${DB_PASSWORD}@postgres:5432/aether
       REDIS_URL: redis://:${REDIS_PASSWORD}@redis:6379/0
-      PORT: 8084
-      JWT_SECRET_KEY: ${JWT_SECRET_KEY}
-      ENCRYPTION_KEY: ${ENCRYPTION_KEY}
-      JWT_ALGORITHM: HS256
-      JWT_EXPIRATION_DELTA: 86400
-      LOG_LEVEL: ${LOG_LEVEL:-INFO}
-      ADMIN_EMAIL: ${ADMIN_EMAIL}
-      ADMIN_USERNAME: ${ADMIN_USERNAME}
-      ADMIN_PASSWORD: ${ADMIN_PASSWORD}
-      API_KEY_PREFIX: ${API_KEY_PREFIX:-sk}
-      GUNICORN_WORKERS: ${GUNICORN_WORKERS:-4}
+      # 容器级别设置
       TZ: Asia/Shanghai
       PYTHONIOENCODING: utf-8
       LANG: C.UTF-8