From 05316b08b443340578e7975c93006c0a37d92e26 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 11 八月 2021 13:09:48 +0800
Subject: [PATCH] update 统一镜像时区配置 移除主机时间映射

---
 docker/docker-compose.yml |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index ac065c3..3302023 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,8 +18,6 @@
       - /docker/mysql/data/:/var/lib/mysql/
       # 閰嶇疆鎸傝浇
       - /docker/mysql/conf/:/etc/mysql/conf.d/
-      # 涓绘満鏈満鏃堕棿鏂囦欢鏄犲皠 涓庢湰鏈烘椂闂村悓姝�
-      - /etc/localtime:/etc/localtime:ro
     command:
       # 灏唌ysql8.0榛樿瀵嗙爜绛栫暐 淇敼涓� 鍘熷厛 绛栫暐 (mysql8.0瀵瑰叾榛樿绛栫暐鍋氫簡鏇存敼 浼氬鑷村瘑鐮佹棤娉曞尮閰�)
       --default-authentication-plugin=mysql_native_password
@@ -37,6 +35,9 @@
     # 濡傛灉闇�瑕佹寚瀹氱増鏈� 灏辨妸 latest 鎹㈡垚鐗堟湰鍙�
     image: nginx:latest
     container_name: nginx-web
+    environment:
+      # 鏃跺尯涓婃捣
+      TZ: Asia/Shanghai
     ports:
       - 80:80
       - 443:443
@@ -49,8 +50,6 @@
       - /docker/nginx/html:/usr/share/nginx/html
       # 鏃ュ織鐩綍
       - /docker/nginx/log:/var/log/nginx
-      # 涓绘満鏈満鏃堕棿鏂囦欢鏄犲皠 涓庢湰鏈烘椂闂村悓姝�
-      - /etc/localtime:/etc/localtime:ro
     privileged: true
     restart: always
     networks:
@@ -62,16 +61,13 @@
     ports:
       - 6379:6379
     environment:
-      # 璁剧疆鐜鍙橀噺 鏃跺尯涓婃捣 缂栫爜UTF-8
+      # 鏃跺尯涓婃捣
       TZ: Asia/Shanghai
-      LANG: en_US.UTF-8
     volumes:
       # 閰嶇疆鏂囦欢
       - /docker/redis/conf/redis.conf:/redis.conf:rw
       # 鏁版嵁鏂囦欢
       - /docker/redis/data:/data:rw
-      # 涓绘満鏈満鏃堕棿鏂囦欢鏄犲皠 涓庢湰鏈烘椂闂村悓姝�
-      - /etc/localtime:/etc/localtime:ro
     command: "redis-server --appendonly yes"
     privileged: true
     restart: always
@@ -88,6 +84,8 @@
       # 鎺у埗鍙扮鍙�
       - 9001:9001
     environment:
+      # 鏃跺尯涓婃捣
+      TZ: Asia/Shanghai
       # 绠＄悊鍚庡彴鐢ㄦ埛鍚�
       MINIO_ACCESS_KEY: ruoyi
       # 绠＄悊鍚庡彴瀵嗙爜锛屾渶灏�8涓瓧绗�
@@ -97,8 +95,6 @@
       - /docker/minio/data:/data
       # 鏄犲皠閰嶇疆鐩綍
       - /docker/minio/config:/root/.minio/
-      # 涓绘満鏈満鏃堕棿鏂囦欢鏄犲皠 涓庢湰鏈烘椂闂村悓姝�
-      - /etc/localtime:/etc/localtime:ro
     command: server --console-address ':9001' /data  # 鎸囧畾瀹瑰櫒涓殑鐩綍 /data
     privileged: true
     restart: always
@@ -109,7 +105,8 @@
   ruoyi-server1:
     image: "ruoyi/ruoyi-server:2.6.0"
     environment:
-      - TZ=Asia/Shanghai
+      # 鏃跺尯涓婃捣
+      TZ: Asia/Shanghai
     volumes:
       # 閰嶇疆鏂囦欢
       - /docker/server1/logs/:/ruoyi/server/logs/
@@ -123,7 +120,8 @@
   ruoyi-server2:
     image: "ruoyi/ruoyi-server:2.6.0"
     environment:
-      - TZ=Asia/Shanghai
+      # 鏃跺尯涓婃捣
+      TZ: Asia/Shanghai
     volumes:
       # 閰嶇疆鏂囦欢
       - /docker/server2/logs/:/ruoyi/server/logs/
@@ -137,7 +135,8 @@
   ruoyi-monitor-admin:
     image: "ruoyi/ruoyi-monitor-admin:2.6.0"
     environment:
-      - TZ=Asia/Shanghai
+      # 鏃跺尯涓婃捣
+      TZ: Asia/Shanghai
     privileged: true
     restart: always
     networks:

--
Gitblit v1.9.3