From b40557ab1e1b222d0b79c1f48f31e33b83823edd Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Mon, 29 Aug 2022 11:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E5=90=8C=E7=89=88?=
 =?UTF-8?q?=E6=9C=AClinux=E4=B8=AD,timezone=E6=8C=82=E8=BD=BD=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/data/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/data/docker-compose.yml b/docker/data/docker-compose.yml
index 76c76e3e..4ed18fbf 100644
--- a/docker/data/docker-compose.yml
+++ b/docker/data/docker-compose.yml
@@ -52,12 +52,13 @@ services:
       - wumei-network
     restart: unless-stopped
     volumes:
-      - /etc/timezone:/etc/timezone
       - /etc/localtime:/etc/localtime
       - /var/data/emqx/conf/emqx_auth_http.conf:/opt/emqx/etc/plugins/emqx_auth_http.conf
       - /var/data/emqx/conf/emqx_web_hook.conf:/opt/emqx/etc/plugins/emqx_web_hook.conf
     environment:
       EMQX_ALLOW__ANONYMOUS: "false"
+      SET_CONTAINER_TIMEZONE: true
+      CONTAINER_TIMEZONE: Asia/Shanghai
 
   java:
     image: openjdk:8-jre
@@ -75,7 +76,6 @@ services:
       - /var/data/java/server.jar:/server.jar
       - /var/data/java/uploadPath:/uploadPath
       - /var/data/java/logs:/logs
-      - /etc/timezone:/etc/timezone
       - /etc/localtime:/etc/localtime
     environment:
       TZ: Asia/Shanghai