Prechádzať zdrojové kódy

Merge branch 'next' of https://gitee.com/zuohuaijun/Admin.NET into next

zuohuaijun 3 rokov pred
rodič
commit
9a10df37de
1 zmenil súbory, kde vykonal 5 pridanie a 0 odobranie
  1. 5 0
      docker/docker-compose.yml

+ 5 - 0
docker/docker-compose.yml

@@ -6,6 +6,8 @@ services:
     ports:
     ports:
       - "9100:80"
       - "9100:80"
       - "9103:443"
       - "9103:443"
+    environment:
+      - TZ=Asia/Shanghai
     volumes:
     volumes:
       - "./nginx/dist:/usr/share/nginx/html"
       - "./nginx/dist:/usr/share/nginx/html"
       - "./nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro"
       - "./nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro"
@@ -32,6 +34,7 @@ services:
       MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_HOST: "%"
       MYSQL_DATABASE: admin
       MYSQL_DATABASE: admin
       MYSQL_ROOT_PASSWORD: root
       MYSQL_ROOT_PASSWORD: root
+      TZ: Asia/Shanghai
     volumes:
     volumes:
       - ./mysql/mysql:/var/lib/mysql
       - ./mysql/mysql:/var/lib/mysql
       - ./mysql/mysql.cnf:/etc/mysql/conf.d/mysql.cnf
       - ./mysql/mysql.cnf:/etc/mysql/conf.d/mysql.cnf
@@ -39,6 +42,8 @@ services:
     image: mcr.microsoft.com/dotnet/aspnet:6.0
     image: mcr.microsoft.com/dotnet/aspnet:6.0
     ports:
     ports:
       - "9102:5050"
       - "9102:5050"
+    environment:
+      - TZ=Asia/Shanghai
     volumes:
     volumes:
       - "./app:/app"
       - "./app:/app"
     working_dir: /app
     working_dir: /app