From 9821f0ca6aa8afc2504bf95b51989c829e49b021 Mon Sep 17 00:00:00 2001
From: slievrly <slievrly@163.com>
Date: Wed, 12 Jul 2023 17:54:36 +0800
Subject: [PATCH 1/2] optimize: optimize docker timezone

Signed-off-by: slievrly <slievrly@163.com>
---
 distribution/Dockerfile | 1 +
 server/pom.xml          | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/distribution/Dockerfile b/distribution/Dockerfile
index b169188f4e9..5e7f19dcaa7 100644
--- a/distribution/Dockerfile
+++ b/distribution/Dockerfile
@@ -39,4 +39,5 @@ ADD LICENSE /seata-server/LICENSE
 
 # set extra environment
 ENV LOADER_PATH="/seata-server/lib"
+ENV TZ="Asia/Shanghai"
 CMD ["bash","-c","/seata-server/bin/seata-server.sh && tail -f /dev/null"]
diff --git a/server/pom.xml b/server/pom.xml
index 11722880281..ee881c9a14b 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -328,6 +328,9 @@
                             <arg>/bin/bash</arg>
                             <arg>/seata-server-entrypoint.sh</arg>
                         </entrypoint>
+                        <environment>
+                            <TZ>Asia/Shanghai</TZ>
+                        </environment>
                     </container>
                     <extraDirectories>
                         <paths>
@@ -346,6 +349,7 @@
                         </paths>
                     </extraDirectories>
                     <skip>${image.publish.skip}</skip>
+                    <allowInsecureRegistries>true</allowInsecureRegistries>
                 </configuration>
                 <executions>
                     <execution>

From 508c30ef7d656174b5c2b699646acfa5338c8658 Mon Sep 17 00:00:00 2001
From: slievrly <slievrly@163.com>
Date: Wed, 12 Jul 2023 18:25:51 +0800
Subject: [PATCH 2/2] add change

Signed-off-by: slievrly <slievrly@163.com>
---
 changes/en-us/2.0.0.md | 1 +
 changes/zh-cn/2.0.0.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md
index e657b349a34..97b83fe5762 100644
--- a/changes/en-us/2.0.0.md
+++ b/changes/en-us/2.0.0.md
@@ -103,6 +103,7 @@ The version is updated as follows:
 - [[#5644](https://github.com/seata/seata/pull/5644)] optimize server logs print
 - [[#5680](https://github.com/seata/seata/pull/5680)] optimize escape character for case of columnNames
 - [[#5714](https://github.com/seata/seata/pull/5714)] optimize distributed lock log
+- [[#5723](https://github.com/seata/seata/pull/5723)] optimize docker default timezone
 
 ### security:
 - [[#5642](https://github.com/seata/seata/pull/5642)] add Hessian Serializer WhiteDenyList
diff --git a/changes/zh-cn/2.0.0.md b/changes/zh-cn/2.0.0.md
index afb3a571aca..da3136565f9 100644
--- a/changes/zh-cn/2.0.0.md
+++ b/changes/zh-cn/2.0.0.md
@@ -103,6 +103,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
 - [[#5644](https://github.com/seata/seata/pull/5644)] 优化Server日志输出
 - [[#5680](https://github.com/seata/seata/pull/5680)] 优化大小写转义符
 - [[#5714](https://github.com/seata/seata/pull/5714)] 优化分布式锁竞争日志
+- [[#5723](https://github.com/seata/seata/pull/5723)] 优化docker镜像的默认时区
 
 ### security:
 - [[#5642](https://github.com/seata/seata/pull/5642)] 增加Hessian 序列化黑白名单