diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 147fd39..8b9e01c 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -7,6 +7,7 @@ services: target: production restart: unless-stopped environment: + TZ: Asia/Shanghai ZHIXING_APP_ENV: production ZHIXING_DATABASE_URL: ${ZHIXING_DATABASE_URL:?Set ZHIXING_DATABASE_URL to the 1Panel PostgreSQL URL} ZHIXING_LOG_LEVEL: ${ZHIXING_LOG_LEVEL:-INFO} @@ -40,6 +41,7 @@ services: server: condition: service_healthy environment: + TZ: Asia/Shanghai API_UPSTREAM: http://server:8000 init: true ports: @@ -55,6 +57,7 @@ services: market-data-init: condition: service_completed_successfully environment: + TZ: Asia/Shanghai ZHIXING_DATABASE_URL: ${ZHIXING_DATABASE_URL:?Set ZHIXING_DATABASE_URL to the 1Panel PostgreSQL URL} networks: - 1panel-network @@ -66,6 +69,8 @@ services: context: ./zhixing-server target: production user: "0:0" + environment: + TZ: Asia/Shanghai command: - sh - -c @@ -83,6 +88,7 @@ services: migrate: condition: service_completed_successfully environment: + TZ: Asia/Shanghai ZHIXING_DATABASE_URL: ${ZHIXING_DATABASE_URL:?Set ZHIXING_DATABASE_URL to the 1Panel PostgreSQL URL} ZHIXING_MARKET_DATA_CSV_ROOT: /app/data/market-data ZHIXING_TUSHARE_TOKEN: ${ZHIXING_TUSHARE_TOKEN:-} diff --git a/zhixing-server/Dockerfile b/zhixing-server/Dockerfile index bd755ac..55fa0fe 100644 --- a/zhixing-server/Dockerfile +++ b/zhixing-server/Dockerfile @@ -21,6 +21,14 @@ CMD ["uvicorn", "zhixing_server.main:app", "--host", "0.0.0.0", "--port", "8000" FROM base AS production +RUN apt-get update \ + && apt-get install --no-install-recommends -y tzdata \ + && ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ + && echo Asia/Shanghai > /etc/timezone \ + && rm -rf /var/lib/apt/lists/* + +ENV TZ=Asia/Shanghai + COPY pyproject.toml uv.lock ./ RUN uv sync --frozen --no-dev --no-install-project COPY README.md ./ diff --git a/zhixing-web/Dockerfile b/zhixing-web/Dockerfile index fdf294c..6fb107e 100644 --- a/zhixing-web/Dockerfile +++ b/zhixing-web/Dockerfile @@ -21,6 +21,11 @@ RUN pnpm build FROM nginx:1.27-alpine AS production +RUN apk add --no-cache tzdata \ + && ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ + && echo Asia/Shanghai > /etc/timezone + +ENV TZ=Asia/Shanghai ENV API_UPSTREAM=http://server:8000 ENV NGINX_ENVSUBST_FILTER=API_UPSTREAM COPY nginx/default.conf.template /etc/nginx/templates/default.conf.template